Merge pull request #281 from Mastermindzh/feature/update

5.7.0
feat: Custom CSS now also applies to settings window
2025-09-09 21:34:44 +02:00 · 2023-08-28 22:17:37 +02:00 · 2023-08-28 16:38:08 +02:00 · 2023-08-28 14:19:12 +02:00 · 2023-08-28 11:14:13 +02:00 · 2023-08-24 10:23:17 +02:00
47 changed files with 772 additions and 267 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,8 +6,10 @@
    "Flatpak",
    "geqnfr",
    "hifi",
+    "libnotify",
    "listenbrainz",
    "playpause",
+    "prs",
    "rescrobbler",
    "scrobble",
    "scrobbling",
@@ -16,5 +18,9 @@
    "tracklist",
    "widevine",
    "xesam"
-  ]
+  ],
+  "sonarlint.connectedMode.project": {
+    "connectionId": "public-sonarcloud",
+    "projectKey": "Mastermindzh_tidal-hifi"
+  }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [5.7.0]
+
+- Renamed app to TIDAL Hi-Fi.
+- Made sure all windows run with the same web preferences set (compared to main app).
+  - Fixes the last.fm bug.
+- Added settings to customize the Discord rich presence information
+  - Discord settings are now also collapsible like the ListenBrainz ones are
+- Restyled settings menu to include version number and useful links on the about page
+    ![The new about page](./docs/images/new-about.png)
+- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
+- Custom CSS now also applies to settings window
+    ![Tokyo Night theme on settings window](./docs/images/customcss-menu.png)
+
+## [5.6.0]
+
+- Added support for Wayland (on by default) fixes [#262](https://github.com/Mastermindzh/tidal-hifi/issues/262) and [#157](https://github.com/Mastermindzh/tidal-hifi/issues/157)
+- Made it clear in the readme that this TIDAL Hi-Fi client supports High & Max audio settings. fixes [#261](https://github.com/Mastermindzh/tidal-hifi/issues/261)
+- Added app suspension inhibitors when music is playing. fixes [#257](https://github.com/Mastermindzh/tidal-hifi/issues/257)
+- Fixed bug with theme files from user directory trying to load: "an error occurred reading the theme file"
+- Fixed: config flags not being set correctly
+- [DEV]:
+  - Logger is now static and will automatically call either ipcRenderer or ipcMain
+
 ## 5.5.0

 - ListenBrainz integration added (thanks @Mar0xy)
@@ -22,7 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - SPKChaosPhoenix updated the beautiful Tokyo Night theme:

-![](./docs/images/tokyo-night.png)
+![tidal with the tokyo night theme applied](./docs/images/tokyo-night.png)

 ## 5.2.0

@@ -79,7 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - New settings window by BlueManCZ
 - Fixed the desktop files in electron-builder
  - icon is set to new static path based on Arch/Debian
-  - Name has changed to Tidal-Hifi
+  - Name has changed to TIDAL Hi-Fi

 ## 4.1.2

@@ -127,7 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - Updated to Electron 15
 - Fixed the develop "build-unpacked" command
- Added setting to disable multiple tidal-hifi windows (defaults to true)
+- Added setting to disable multiple TIDAL Hi-Fi windows (defaults to true)
 - Added setting to disable HardwareMediaKeyHandling (defaults to false)

 ## 2.8.2
@@ -165,7 +188,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## 2.5.0

- Notify-send now correctly shows "Tidal HiFi" as the program name
+- Notify-send now correctly shows "Tidal Hi-Fi" as the program name
 - Updated dependencies (including electron itself)

 ### known issues
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
-# Tidal-hifi<img src = "./build/icon.png" height="40" align="right"/>
+# TIDAL Hi-Fi (Max quality)<img src = "./build/icon.png" height="40" align="right"/>

 ![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg) [![github builds](https://github.com/mastermindzh/tidal-hifi/actions/workflows/build.yml/badge.svg)](https://github.com/Mastermindzh/tidal-hifi/actions) [![Build Status](https://ci.mastermindzh.tech/api/badges/Mastermindzh/tidal-hifi/status.svg)](https://ci.mastermindzh.tech/Mastermindzh/tidal-hifi) [![Discord logo](./docs/images/discord.png)](https://discord.gg/yhNwf4v4He)

-The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi support thanks to widevine.
+The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with Hi-Fi (High & Max) support thanks to widevine.

-![tidal-hifi preview](./docs/images/preview.png)
+![TIDAL Hi-Fi preview](./docs/images/preview.png)

 ## Table of Contents

 <!-- toc -->

- [Tidal-hifi](#tidal-hifi)
+- [TIDAL Hi-Fi (Max quality)](#tidal-hi-fi-max-quality)
  - [Table of Contents](#table-of-contents)
  - [Features](#features)
  - [Contributions](#contributions)
-  - [Why did I create tidal-hifi?](#why-did-i-create-tidal-hifi)
+  - [Why did I create TIDAL Hi-Fi?](#why-did-i-create-tidal-hi-fi)
    - [Why not extend existing projects?](#why-not-extend-existing-projects)
  - [Installation](#installation)
    - [Dependencies](#dependencies)
@@ -25,9 +25,8 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
    - [Nix](#nix)
    - [Using source](#using-source)
  - [Integrations](#integrations)
-    - [Known bugs](#known-bugs)
-      - [last.fm doesn't work out of the box. Use rescrobbler as a workaround](#lastfm-doesnt-work-out-of-the-box-use-rescrobbler-as-a-workaround)
-      - [DRM not working on Windows](#drm-not-working-on-windows)
+  - [Known bugs](#known-bugs)
+    - [DRM not working on Windows](#drm-not-working-on-windows)
  - [Special thanks to](#special-thanks-to)
  - [Donations](#donations)
  - [Images](#images)
@@ -38,29 +37,33 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect

 ## Features

- HiFi playback
+- HiFi playback (High & Max settings)
 - Notifications
 - Custom [theming](./docs/theming.md)
 - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
- Songwhip.com integration (hotkey `ctrl + w`)
+- Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/)
+- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
 - API for status and playback
 - Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
- Custom [integrations](#integrations)
- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
 - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
- [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
+- Custom [integrations](#integrations)
+  - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
+  - Songwhip.com integration (hotkey `ctrl + w`)
+  - Discord RPC integration (showing "now listening", "Browsing", etc)
+  - MPRIS integration
+- UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)

 ## Contributions

-To contribute you can use the standard GitHub features (issues, prs, etc) or join the discord server to talk with like-minded individuals.
+To contribute you can use the standard GitHub features (issues, prs, etc.) or join the discord server to talk with like-minded individuals.

 - ![Discord logo](./docs/images/discord.png) [Join the Discord server](https://discord.gg/yhNwf4v4He)

-## Why did I create tidal-hifi?
+## Why did I create TIDAL Hi-Fi?

 I moved from Spotify over to Tidal and found Linux support to be lacking.
-
 When I started this project there weren't any Linux apps that offered Tidal's "hifi" options nor any scripts to control it.
+I made this app to support the highest quality audio available on the Linux platform. It used to be "hifi" but now is ["High & Max"](https://tidal.com/sound-quality).

 ### Why not extend existing projects?

@@ -101,10 +104,10 @@ To install with `snap` you need to download the pre-packaged snap-package from t

 ### Arch Linux

-Arch Linux users can use the AUR to install tidal-hifi:
+Arch Linux users can use the AUR to install TIDAL Hi-Fi:

 ```sh
-trizen tidal-hifi-bin
+trizen tidal-hifi-git
 ```

 ### Flatpak
@@ -128,37 +131,27 @@ nix-env -iA nixpkgs.tidal-hifi
 To install and work with the code on this project follow these steps:

 - git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)
- cd tidal-hifi
+- cd TIDAL Hi-Fi
 - npm install
 - npm start

 ## Integrations

-tidal-hifi comes with several integrations out of the box.
+TIDAL Hi-Fi comes with several integrations out of the box.
 You can find these in the settings menu (`ctrl + =` by default) under the "integrations" tab.

 ![integrations menu, showing a list of integrations](./docs/images/integrations.png)

-It currently includes:
-
- MPRIS - MPRIS media player controls/status
- Discord - Shows what you're listening to on Discord.
-
-Not included:
+Integrations with other projects that are not included natively:

 - [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
+- [neptune](https://github.com/uwu/neptune) third party plugins & theming

-### Known bugs
+## Known bugs

-#### last.fm doesn't work out of the box. Use rescrobbler as a workaround
+### DRM not working on Windows

-The last.fm login doesn't work, as is evident from the following issue: [Last.fm login doesn't work](https://github.com/Mastermindzh/tidal-hifi/issues/4).
-However, in that same issue you can read about a workaround using [rescrobbler](https://github.com/InputUsername/rescrobbled).
-For now, that will be the default workaround.
-
-#### DRM not working on Windows
-
-Most Windows users run into DRM issues when trying to use tidal-hifi.
+Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
 Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot.

 ## Special thanks to
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+Only the very latest 😄.
+
+## Reporting a Vulnerability
+
+If you find a vulnerability just add it as an issue.
+If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
+
--- a/assets/TIDAL.icns
+++ b/assets/TIDAL.icns
--- a/assets/icon-inverted.png
+++ b/assets/icon-inverted.png
--- a/assets/icon.png
+++ b/assets/icon.png
--- a/assets/icons/128x128.png
+++ b/assets/icons/128x128.png
--- a/assets/icons/16x16.png
+++ b/assets/icons/16x16.png
--- a/assets/icons/22x22.png
+++ b/assets/icons/22x22.png
--- a/assets/icons/24x24.png
+++ b/assets/icons/24x24.png
--- a/assets/icons/256x256.png
+++ b/assets/icons/256x256.png
--- a/assets/icons/32x32.png
+++ b/assets/icons/32x32.png
--- a/assets/icons/384x384.png
+++ b/assets/icons/384x384.png
--- a/assets/icons/48x48.png
+++ b/assets/icons/48x48.png
--- a/assets/icons/64x64.png
+++ b/assets/icons/64x64.png
--- a/build/icon-inverted.png
+++ b/build/icon-inverted.png
--- a/build/icon.icns
+++ b/build/icon.icns
--- a/build/icon.png
+++ b/build/icon.png
--- a/docs/images/customcss-menu.png
+++ b/docs/images/customcss-menu.png
--- a/docs/images/integrations.png
+++ b/docs/images/integrations.png
--- a/docs/images/new-about.png
+++ b/docs/images/new-about.png
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -1,10 +1,10 @@
-# Theming tidal-hifi
+# Theming TIDAL Hi-Fi

 ## Table of contents

 <!-- toc -->

- [Theming tidal-hifi](#theming-tidal-hifi)
+- [Theming TIDAL Hi-Fi](#theming-TIDAL Hi-Fi)
  - [Table of contents](#table-of-contents)
  - [Custom CSS](#custom-css)
  - [config](#config)
@@ -12,7 +12,7 @@

 <!-- tocstop -->

-By default tidal-hifi comes with a few themes.
+By default TIDAL Hi-Fi comes with a few themes.
 You can select these in the settings window under the theming tab as shown below.

 ![Settings window with the theming tab opened](./images/theming.png)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "tidal-hifi",
-  "version": "5.5.0",
+  "name": "TIDAL Hi-Fi",
+  "version": "5.6.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
-      "name": "tidal-hifi",
-      "version": "5.5.0",
+      "name": "TIDAL Hi-Fi",
+      "version": "5.6.0",
      "license": "MIT",
      "dependencies": {
        "@electron/remote": "^2.0.10",
@@ -14,7 +14,7 @@
        "discord-rpc": "^4.0.1",
        "electron-store": "^8.1.0",
        "express": "^4.18.2",
-        "hotkeys-js": "^3.11.2",
+        "hotkeys-js": "^3.12.0",
        "mpris-service": "^2.1.2",
        "request": "^2.88.2",
        "sass": "^1.64.1"
@@ -4855,9 +4855,9 @@
      }
    },
    "node_modules/hotkeys-js": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.11.2.tgz",
-      "integrity": "sha512-hLuR+wtvrVrVFHku5cud44cPXQf5ke+96TonRaGzlNSt22rh2LH65avLYFNsc+QpzMuOEQG/IxJT5mEop99rvg=="
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.12.0.tgz",
+      "integrity": "sha512-Z+N573ycUKIGwFYS3ID1RzMJiGmtWMGKMiaNLyJS8B1ei+MllF4ZYmKS2T0kMWBktOz+WZLVNikftEgnukOrXg=="
    },
    "node_modules/html-tags": {
      "version": "3.3.1",
@@ -9340,4 +9340,4 @@
      }
    }
  }
-}
+}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tidal-hifi",
-  "version": "5.5.0",
+  "version": "5.7.0",
  "description": "Tidal on Electron with widevine(hifi) support",
  "main": "ts-dist/main.js",
  "scripts": {
@@ -43,7 +43,7 @@
    "discord-rpc": "^4.0.1",
    "electron-store": "^8.1.0",
    "express": "^4.18.2",
-    "hotkeys-js": "^3.11.2",
+    "hotkeys-js": "^3.12.0",
    "mpris-service": "^2.1.2",
    "request": "^2.88.2",
    "sass": "^1.64.1"
--- a/scripts/resize-icons.sh
+++ b/scripts/resize-icons.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ "$1" != "" ]; then # check if arg 1 is present
+    FILE=$1
+else
+    echo "Please provide a file as an argument."
+    exit 1
+fi
+
+SIZES=("16x16" "22x22" "24x24" "32x32" "48x48" "64x64" "128x128" "256x256" "384x384")
+
+echo "Resizing $FILE..."
+
+for i in "${SIZES[@]}"; do
+    convert "$FILE" -resize "$i" "$i.png"
+done
--- a/listen.tidal.com-parsing-scripts/verifyElements.js
+++ b/listen.tidal.com-parsing-scripts/verifyElements.js
--- a/src/constants/flags.ts
+++ b/src/constants/flags.ts
@@ -1,4 +1,9 @@
 export const flags: { [key: string]: { flag: string; value?: string }[] } = {
  gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
  disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
+  enableWaylandSupport: [
+    { flag: "enable-features", value: "UseOzonePlatform" },
+    { flag: "ozone-platform-hint", value: "auto" },
+    { flag: "enable-features", value: "WaylandWindowDecorations" },
+  ],
 };
--- a/src/constants/settings.ts
+++ b/src/constants/settings.ts
@@ -20,16 +20,22 @@ export const settings = {
  disableHardwareMediaKeys: "disableHardwareMediaKeys",
  enableCustomHotkeys: "enableCustomHotkeys",
  enableDiscord: "enableDiscord",
+  discord: {
+    detailsPrefix: "discord.detailsPrefix",
+    buttonText: "discord.buttonText",
+  },
  ListenBrainz: {
    root: "ListenBrainz",
    enabled: "ListenBrainz.enabled",
    api: "ListenBrainz.api",
    token: "ListenBrainz.token",
+    delay: "ListenBrainz.delay",
  },
  flags: {
    root: "flags",
    disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
    gpuRasterization: "flags.gpuRasterization",
+    enableWaylandSupport: "flags.enableWaylandSupport",
  },
  menuBar: "menuBar",
  minimizeOnClose: "minimizeOnClose",
--- a/src/constants/values.ts
+++ b/src/constants/values.ts
@@ -1,3 +1,3 @@
 export default {
-  name: "tidal-hifi",
+  name: "TIDAL Hi-Fi",
 };
--- a/src/features/flags/flags.ts
+++ b/src/features/flags/flags.ts
@@ -0,0 +1,41 @@
+import { App } from "electron";
+import { flags } from "../../constants/flags";
+import { settings } from "../../constants/settings";
+import { settingsStore } from "../../scripts/settings";
+import { Logger } from "../logger";
+
+/**
+ * Set default Electron flags
+ */
+export function setDefaultFlags(app: App) {
+  setFlag(app, "disable-seccomp-filter-sandbox");
+}
+
+/**
+ * Set Tidal's managed flags from the user settings
+ * @param app
+ */
+export function setManagedFlagsFromSettings(app: App) {
+  const flagsFromSettings = settingsStore.get(settings.flags.root);
+  if (flagsFromSettings) {
+    for (const [key, value] of Object.entries(flagsFromSettings)) {
+      if (value) {
+        flags[key].forEach((flag) => {
+          setFlag(app, flag.flag, flag.value);
+        });
+      }
+    }
+  }
+}
+
+/**
+ * Set a single flag for Electron
+ * @param app app to set it on
+ * @param flag flag name
+ * @param value value to be set for the flag
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setFlag(app: App, flag: string, value?: any) {
+  Logger.log(`enabling command line option ${flag} with value ${value}`);
+  app.commandLine.appendSwitch(flag, value);
+}
--- a/src/features/idleInhibitor/idleInhibitor.ts
+++ b/src/features/idleInhibitor/idleInhibitor.ts
@@ -0,0 +1,65 @@
+import { PowerSaveBlocker, powerSaveBlocker } from "electron";
+import { Logger } from "../logger";
+
+/**
+ * Start blocking idle/screen timeouts
+ * @param blocker optional instance of the powerSaveBlocker to use
+ * @returns id of current block
+ */
+export const acquireInhibitor = (blocker?: PowerSaveBlocker): number => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  const blockId = currentBlocker.start("prevent-app-suspension");
+  Logger.log(`Started preventing app suspension with id: ${blockId}`);
+  return blockId;
+};
+
+/**
+ * Check whether there is a blocker active for the current id, if not start it.
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const acquireInhibitorIfInactive = (id: number, blocker?: PowerSaveBlocker): number => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  if (!isInhibitorActive(id, currentBlocker)) {
+    return acquireInhibitor();
+  }
+
+  return id;
+};
+
+/**
+ * stop blocking idle/screen timeouts
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const releaseInhibitor = (id: number, blocker?: PowerSaveBlocker) => {
+  try {
+    const currentBlocker = blocker ?? powerSaveBlocker;
+    currentBlocker.stop(id);
+    Logger.log(`Released inhibitor with id: ${id}`);
+  } catch (error) {
+    Logger.log("Releasing inhibitor failed");
+  }
+};
+
+/**
+ * stop blocking idle/screen timeouts if a inhibitor is active
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const releaseInhibitorIfActive = (id: number, blocker?: PowerSaveBlocker) => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  if (isInhibitorActive(id, currentBlocker)) {
+    releaseInhibitor(id, currentBlocker);
+  }
+};
+
+/**
+ * check whether the inhibitor is active
+ * @param id id of inhibitor you want to check activity against
+ * @param blocker optional instance of the powerSaveBlocker to use
+ */
+export const isInhibitorActive = (id: number, blocker?: PowerSaveBlocker) => {
+  const currentBlocker = blocker ?? powerSaveBlocker;
+  return currentBlocker.isStarted(id);
+};
--- a/src/features/listenbrainz/listenbrainz.ts
+++ b/src/features/listenbrainz/listenbrainz.ts
@@ -1,5 +1,4 @@
 import axios from "axios";
-import { ipcRenderer } from "electron";
 import Store from "electron-store";
 import { settings } from "../../constants/settings";
 import { MediaStatus } from "../../models/mediaStatus";
@@ -125,8 +124,7 @@ export class ListenBrainz {
        }
      }
    } catch (error) {
-      const logger = new Logger(ipcRenderer);
-      logger.log(JSON.stringify(error));
+      Logger.log(JSON.stringify(error));
    }
  }
 }
--- a/src/features/logger.ts
+++ b/src/features/logger.ts
@@ -1,32 +1,52 @@
-import { IpcMain, IpcRenderer } from "electron";
+import { IpcMain, ipcMain, IpcMainEvent, ipcRenderer } from "electron";
 import { globalEvents } from "../constants/globalEvents";

 export class Logger {
-  /**
-   *
-   * @param ipcRenderer renderer IPC client so we can send messages to the main thread
-   */
-  constructor(private ipcRenderer: IpcRenderer) {}
-
  /**
   * Subscribe to watch for logs from the IPC client
   * @param ipcMain main thread IPC client so we can subscribe to events
   */
  public static watch(ipcMain: IpcMain) {
-    ipcMain.on(globalEvents.log, (event, content, object) => {
-      console.log(content, JSON.stringify(object, null, 2));
-    });
+    ipcMain.on(
+      globalEvents.log,
+      (event: IpcMainEvent | { content: string; message: string }, message) => {
+        const { content, object } = message ?? event;
+        this.logToSTDOut(content, object);
+      }
+    );
  }
-
  /**
   * Log content to STDOut
   * @param content
   * @param object js(on) object that will be prettyPrinted
   */
-  public log(content: string, object: object = {}) {
-    if (this.ipcRenderer) {
-      this.ipcRenderer.send(globalEvents.log, { content, object });
+  public static log(content: string, object: object = {}) {
+    if (ipcRenderer) {
+      ipcRenderer.send(globalEvents.log, { content, object });
+    } else {
+      ipcMain.emit(globalEvents.log, { content, object });
    }
-    console.log(`${content} \n ${JSON.stringify(object, null, 2)}`);
+  }
+
+  /**
+   * Log content to STDOut and use the provided alert function to alert
+   * @param content
+   * @param object js(on) object that will be prettyPrinted
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  public static alert(content: string, object: any = {}, alert?: (msg: string) => void) {
+    Logger.log(content, object);
+    if (alert) {
+      alert(`${content} \n\nwith details: \n${JSON.stringify(object, null, 2)}`);
+    }
+  }
+
+  /**
+   * Log to STDOut
+   * @param content
+   * @param object
+   */
+  private static logToSTDOut(content: string, object = {}) {
+    console.log(content, Object.keys(object).length > 0 ? JSON.stringify(object, null, 2) : "");
  }
 }
--- a/src/features/theming/theming.ts
+++ b/src/features/theming/theming.ts
@@ -0,0 +1,31 @@
+import fs from "fs";
+import { settings } from "../../constants/settings";
+import { settingsStore } from "../../scripts/settings";
+import { Logger } from "../logger";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function addCustomCss(app: any, logger: typeof Logger) {
+  window.addEventListener("DOMContentLoaded", () => {
+    const selectedTheme = settingsStore.get<string, string>(settings.theme);
+    if (selectedTheme !== "none") {
+      const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
+      const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
+      const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
+      fs.readFile(themeFile, "utf-8", (err, data) => {
+        if (err) {
+          logger.alert("An error ocurred reading the theme file.", err, alert);
+          return;
+        }
+
+        const themeStyle = document.createElement("style");
+        themeStyle.innerHTML = data;
+        document.head.appendChild(themeStyle);
+      });
+    }
+
+    // read customCSS (it will override the theme)
+    const style = document.createElement("style");
+    style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
+    document.head.appendChild(style);
+  });
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import { enable, initialize } from "@electron/remote/main";
 import {
-  BrowserWindow,
  app,
+  BrowserWindow,
  components,
  globalShortcut,
  ipcMain,
@@ -9,9 +9,18 @@ import {
  session,
 } from "electron";
 import path from "path";
-import { flags } from "./constants/flags";
 import { globalEvents } from "./constants/globalEvents";
 import { mediaKeys } from "./constants/mediaKeys";
+import { settings } from "./constants/settings";
+import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
+import {
+  acquireInhibitorIfInactive,
+  releaseInhibitorIfActive,
+} from "./features/idleInhibitor/idleInhibitor";
+import { Logger } from "./features/logger";
+import { Songwhip } from "./features/songwhip/songwhip";
+import { MediaInfo } from "./models/mediaInfo";
+import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
 import { startExpress } from "./scripts/express";
 import { updateMediaInfo } from "./scripts/mediaInfo";
@@ -20,42 +29,25 @@ import {
  closeSettingsWindow,
  createSettingsWindow,
  hideSettingsWindow,
-  showSettingsWindow,
  settingsStore,
+  showSettingsWindow,
 } from "./scripts/settings";
-import { settings } from "./constants/settings";
 import { addTray, refreshTray } from "./scripts/tray";
-import { MediaInfo } from "./models/mediaInfo";
-import { Songwhip } from "./features/songwhip/songwhip";
-import { Logger } from "./features/logger";
 const tidalUrl = "https://listen.tidal.com";
+let mainInhibitorId = -1;

 initialize();
-
 let mainWindow: BrowserWindow;
 const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
+const windowPreferences = {
+  sandbox: false,
+  plugins: true,
+  devTools: true, // I like tinkering, others might too
+};

-setFlags();
-
-function setFlags() {
-  const flagsFromSettings = settingsStore.get(settings.flags.root);
-  if (flagsFromSettings) {
-    for (const [key, value] of Object.entries(flags)) {
-      if (value) {
-        flags[key].forEach((flag) => {
-          console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
-          app.commandLine.appendSwitch(flag.flag, flag.value);
-        });
-      }
-    }
-  }
-
-  /**
-   * Fix Display Compositor issue.
-   */
-  app.commandLine.appendSwitch("disable-seccomp-filter-sandbox");
-}
+setDefaultFlags(app);
+setManagedFlagsFromSettings(app);

 /**
 * Update the menuBarVisibility according to the store value
@@ -90,16 +82,16 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
  mainWindow = new BrowserWindow({
    x: options.x,
    y: options.y,
-    width: settingsStore && settingsStore.get(settings.windowBounds.width),
-    height: settingsStore && settingsStore.get(settings.windowBounds.height),
+    width: settingsStore?.get(settings.windowBounds.width),
+    height: settingsStore?.get(settings.windowBounds.height),
    icon,
    backgroundColor: options.backgroundColor,
    autoHideMenuBar: true,
    webPreferences: {
-      sandbox: false,
-      preload: path.join(__dirname, "preload.js"),
-      plugins: true,
-      devTools: true, // I like tinkering, others might too
+      ...windowPreferences,
+      ...{
+        preload: path.join(__dirname, "preload.js"),
+      },
    },
  });
  enable(mainWindow.webContents);
@@ -124,6 +116,7 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
  });
  // Emitted when the window is closed.
  mainWindow.on("closed", function () {
+    releaseInhibitorIfActive(mainInhibitorId);
    closeSettingsWindow();
    app.quit();
  });
@@ -131,6 +124,18 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
    const { width, height } = mainWindow.getBounds();
    settingsStore.set(settings.windowBounds.root, { width, height });
  });
+  mainWindow.webContents.setWindowOpenHandler(() => {
+    return {
+      action: "allow",
+      overrideBrowserWindowOptions: {
+        webPreferences: {
+          sandbox: false,
+          plugins: true,
+          devTools: true, // I like tinkering, others might too
+        },
+      },
+    };
+  });
 }

 function registerHttpProtocols() {
@@ -196,6 +201,12 @@ app.on("browser-window-created", (_, window) => {
 // IPC
 ipcMain.on(globalEvents.updateInfo, (_event, arg: MediaInfo) => {
  updateMediaInfo(arg);
+  if (arg.status === MediaStatus.playing) {
+    mainInhibitorId = acquireInhibitorIfInactive(mainInhibitorId);
+  } else {
+    releaseInhibitorIfActive(mainInhibitorId);
+    mainInhibitorId = -1;
+  }
 });

 ipcMain.on(globalEvents.hideSettings, () => {
@@ -224,7 +235,7 @@ ipcMain.on(globalEvents.error, (event) => {
 });

 ipcMain.handle(globalEvents.whip, async (event, url) => {
-  return await Songwhip.whip(url);
+  return Songwhip.whip(url);
 });

 Logger.watch(ipcMain);
--- a/src/pages/settings/icon.png
+++ b/src/pages/settings/icon.png
--- a/src/pages/settings/preload.ts
+++ b/src/pages/settings/preload.ts
@@ -3,9 +3,25 @@ import { ipcRenderer, shell } from "electron";
 import fs from "fs";
 import { globalEvents } from "../../constants/globalEvents";
 import { settings } from "../../constants/settings";
+import { Logger } from "../../features/logger";
+import { addCustomCss } from "../../features/theming/theming";
 import { settingsStore } from "./../../scripts/settings";
 import { getOptions, getOptionsHeader, getThemeListFromDirectory } from "./theming";

+// All switches on the settings screen that show additional options based on their state
+const switchesWithSettings = {
+  listenBrainz: {
+    switch: "enableListenBrainz",
+    classToHide: "listenbrainz__options",
+    settingsKey: settings.ListenBrainz.enabled,
+  },
+  discord: {
+    switch: "enableDiscord",
+    classToHide: "discord_options",
+    settingsKey: settings.enableDiscord,
+  },
+};
+
 let adBlock: HTMLInputElement,
  api: HTMLInputElement,
  customCSS: HTMLInputElement,
@@ -28,7 +44,13 @@ let adBlock: HTMLInputElement,
  updateFrequency: HTMLInputElement,
  enableListenBrainz: HTMLInputElement,
  ListenBrainzAPI: HTMLInputElement,
-  ListenBrainzToken: HTMLInputElement;
+  ListenBrainzToken: HTMLInputElement,
+  listenbrainz_delay: HTMLInputElement,
+  enableWaylandSupport: HTMLInputElement,
+  discord_details_prefix: HTMLInputElement,
+  discord_button_text: HTMLInputElement;
+
+addCustomCss(app, Logger.bind(this));

 function getThemeFiles() {
  const selectElement = document.getElementById("themesList") as HTMLSelectElement;
@@ -57,6 +79,7 @@ function handleFileUploads() {
  const fileMessage = document.getElementById("file-message");
  fileMessage.innerText = "or drag and drop files here";

+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  document.getElementById("theme-files").addEventListener("change", function (e: any) {
    Array.from(e.target.files).forEach((file: File) => {
      const destination = `${app.getPath("userData")}/themes/${file.name}`;
@@ -67,33 +90,60 @@ function handleFileUploads() {
  });
 }

+/**
+ * hide or unhide an element
+ * @param checked
+ * @param toggleOptions
+ */
+function setElementHidden(
+  checked: boolean,
+  toggleOptions: { switch: string; classToHide: string }
+) {
+  const element = document.getElementById(toggleOptions.classToHide);
+
+  checked ? element.classList.remove("hidden") : element.classList.add("hidden");
+}
+
 /**
 * Sync the UI forms with the current settings
 */
 function refreshSettings() {
-  adBlock.checked = settingsStore.get(settings.adBlock);
-  api.checked = settingsStore.get(settings.api);
-  customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
-  disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
-  disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
-  enableCustomHotkeys.checked = settingsStore.get(settings.enableCustomHotkeys);
-  enableDiscord.checked = settingsStore.get(settings.enableDiscord);
-  gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
-  menuBar.checked = settingsStore.get(settings.menuBar);
-  minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
-  mpris.checked = settingsStore.get(settings.mpris);
-  notifications.checked = settingsStore.get(settings.notifications);
-  playBackControl.checked = settingsStore.get(settings.playBackControl);
-  port.value = settingsStore.get(settings.apiSettings.port);
-  singleInstance.checked = settingsStore.get(settings.singleInstance);
-  skipArtists.checked = settingsStore.get(settings.skipArtists);
-  theme.value = settingsStore.get(settings.theme);
-  skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
-  trayIcon.checked = settingsStore.get(settings.trayIcon);
-  updateFrequency.value = settingsStore.get(settings.updateFrequency);
-  enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
-  ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
-  ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
+  try {
+    adBlock.checked = settingsStore.get(settings.adBlock);
+    api.checked = settingsStore.get(settings.api);
+    customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
+    disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
+    disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
+    enableCustomHotkeys.checked = settingsStore.get(settings.enableCustomHotkeys);
+    enableDiscord.checked = settingsStore.get(settings.enableDiscord);
+    enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
+    gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
+    menuBar.checked = settingsStore.get(settings.menuBar);
+    minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
+    mpris.checked = settingsStore.get(settings.mpris);
+    notifications.checked = settingsStore.get(settings.notifications);
+    playBackControl.checked = settingsStore.get(settings.playBackControl);
+    port.value = settingsStore.get(settings.apiSettings.port);
+    singleInstance.checked = settingsStore.get(settings.singleInstance);
+    skipArtists.checked = settingsStore.get(settings.skipArtists);
+    theme.value = settingsStore.get(settings.theme);
+    skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
+    trayIcon.checked = settingsStore.get(settings.trayIcon);
+    updateFrequency.value = settingsStore.get(settings.updateFrequency);
+    enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
+    ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
+    ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
+    listenbrainz_delay.value = settingsStore.get(settings.ListenBrainz.delay);
+    discord_details_prefix.value = settingsStore.get(settings.discord.detailsPrefix);
+    discord_button_text.value = settingsStore.get(settings.discord.buttonText);
+
+    // set state of all switches with additional settings
+    Object.values(switchesWithSettings).forEach((settingSwitch) => {
+      setElementHidden(settingsStore.get(settingSwitch.settingsKey), settingSwitch);
+    });
+  } catch (error) {
+    Logger.log("Refreshing settings failed.", error);
+  }
 }

 /**
@@ -110,14 +160,6 @@ function hide() {
  ipcRenderer.send(globalEvents.hideSettings);
 }

-/**
- * Restart tidal-hifi after changes
- */
-function restart() {
-  app.relaunch();
-  app.exit();
-}
-
 /**
 * Bind UI components to functions after DOMContentLoaded
 */
@@ -130,23 +172,28 @@ window.addEventListener("DOMContentLoaded", () => {
  handleFileUploads();

  document.getElementById("close").addEventListener("click", hide);
-  document.getElementById("restart").addEventListener("click", restart);
  document.querySelectorAll(".external-link").forEach((elem) =>
    elem.addEventListener("click", function (event) {
      openExternal((event.target as HTMLElement).getAttribute("data-url"));
    })
  );

-  function addInputListener(source: HTMLInputElement, key: string) {
+  function addInputListener(
+    source: HTMLInputElement,
+    key: string,
+    toggleOptions?: { switch: string; classToHide: string }
+  ) {
    source.addEventListener("input", () => {
      if (source.value === "on") {
        settingsStore.set(key, source.checked);
      } else {
        settingsStore.set(key, source.value);
      }
-      // Live update the view for ListenBrainz input, hide if disabled/show if enabled
-      if (source.value === "on" && source.id === "enableListenBrainz") {
-        source.checked ? document.getElementById("listenbrainz__options").removeAttribute("hidden") : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
+
+      if (toggleOptions) {
+        if (source.value === "on" && source.id === toggleOptions.switch) {
+          setElementHidden(source.checked, toggleOptions);
+        }
      }
      ipcRenderer.send(globalEvents.storeChanged);
    });
@@ -181,6 +228,7 @@ window.addEventListener("DOMContentLoaded", () => {
  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
  enableCustomHotkeys = get("enableCustomHotkeys");
  enableDiscord = get("enableDiscord");
+  enableWaylandSupport = get("enableWaylandSupport");
  gpuRasterization = get("gpuRasterization");
  menuBar = get("menuBar");
  minimizeOnClose = get("minimizeOnClose");
@@ -197,17 +245,19 @@ window.addEventListener("DOMContentLoaded", () => {
  enableListenBrainz = get("enableListenBrainz");
  ListenBrainzAPI = get("ListenBrainzAPI");
  ListenBrainzToken = get("ListenBrainzToken");
+  discord_details_prefix = get("discord_details_prefix");
+  listenbrainz_delay = get("listenbrainz_delay");
+  discord_button_text = get("discord_button_text");

  refreshSettings();
-  enableListenBrainz.checked ? document.getElementById("listenbrainz__options").removeAttribute("hidden") : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
-
  addInputListener(adBlock, settings.adBlock);
  addInputListener(api, settings.api);
  addTextAreaListener(customCSS, settings.customCSS);
  addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
  addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
  addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
-  addInputListener(enableDiscord, settings.enableDiscord);
+  addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
+  addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
  addInputListener(menuBar, settings.menuBar);
  addInputListener(minimizeOnClose, settings.minimizeOnClose);
@@ -221,7 +271,14 @@ window.addEventListener("DOMContentLoaded", () => {
  addSelectListener(theme, settings.theme);
  addInputListener(trayIcon, settings.trayIcon);
  addInputListener(updateFrequency, settings.updateFrequency);
-  addInputListener(enableListenBrainz, settings.ListenBrainz.enabled);
-  addTextAreaListener(ListenBrainzAPI, settings.ListenBrainz.api);
-  addTextAreaListener(ListenBrainzToken, settings.ListenBrainz.token);
+  addInputListener(
+    enableListenBrainz,
+    settings.ListenBrainz.enabled,
+    switchesWithSettings.listenBrainz
+  );
+  addInputListener(ListenBrainzAPI, settings.ListenBrainz.api);
+  addInputListener(ListenBrainzToken, settings.ListenBrainz.token);
+  addInputListener(listenbrainz_delay, settings.ListenBrainz.delay);
+  addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
+  addInputListener(discord_button_text, settings.discord.buttonText);
 });
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -7,6 +7,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
  <link rel="stylesheet" href="./settings.css" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 </head>

 <body class="settings-window">
@@ -201,6 +202,9 @@
                <span class="switch__slider"></span>
              </label>
            </div>
+          </div>
+          <div class="group">
+            <p class="group__title">Discord</p>
            <div class="group__option">
              <div class="group__description">
                <h4>Discord RPC</h4>
@@ -211,6 +215,23 @@
                <span class="switch__slider"></span>
              </label>
            </div>
+            <div id="discord_options">
+              <div class="group__option" class="hidden">
+                <div class="group__description">
+                  <h4>Details prefix</h4>
+                  <p>Prefix for the "details" field of Discord's rich presence.</p>
+                  <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
+                </div>
+              </div>
+
+              <div class="group__option">
+                <div class="group__description">
+                  <h4>Button text</h4>
+                  <p>Text to display on the button below the song information.</p>
+                  <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
+                </div>
+              </div>
+            </div>
          </div>
          <div class="group">
            <p class="group__title">ListenBrainz</p>
@@ -224,21 +245,27 @@
                <span class="switch__slider"></span>
              </label>
            </div>
-            <div id="listenbrainz__options" hidden="true">
+            <div id="listenbrainz__options" class="hidden">
              <div class="group__option">
                <div class="group__description">
                  <h4>ListenBrainz API Url</h4>
                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
+                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
                </div>
              </div>
-              <textarea id="ListenBrainzAPI" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
              <div class="group__option">
                <div class="group__description">
                  <h4>ListenBrainz User Token</h4>
                  <p>Provide the user token you can get from the settings page.</p>
+                  <input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
                </div>
              </div>
-              <textarea id="ListenBrainzToken" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
+            </div>
+            <div class="group__description">
+              <h4>ScrobbleDelay</h4>
+              <p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
+                immediately</p>
+              <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
            </div>
          </div>
        </section>
@@ -250,7 +277,7 @@
              <div class="group__description">
                <h4>Update frequency</h4>
                <p>
-                  The amount of time, in milliseconds, that tidal-hifi will refresh its playback info by scraping the
+                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
                  website.
                  The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
                  can decrease it as well.
@@ -258,44 +285,57 @@
                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
              </div>
            </div>
-            <div class="group">
-              <p class="group__title">Flags</p>
-              <div class="group__option">
-                <div class="group__description">
-                  <h4>Disable hardware built-in media keys</h4>
-                  <p>
-                    Also prevents certain desktop environments from recognizing the chrome MPRIS
-                    client separately from the custom MPRIS client.
-                  </p>
-                </div>
-                <label class="switch">
-                  <input id="disableHardwareMediaKeys" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-              <div class="group__option">
-                <div class="group__description">
-                  <h4>Enable GPU rasterization</h4>
-                  <p>Move a part of the rendering to the GPU for increased performance.</p>
-                </div>
-                <label class="switch">
-                  <input id="gpuRasterization" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-              <div class="group__option">
-                <div class="group__description">
-                  <h4>Disable Background Throttling</h4>
-                  <p>
-                    Makes app more responsive while in the background, at the cost of performance.
-                  </p>
-                </div>
-                <label class="switch">
-                  <input id="disableBackgroundThrottle" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
+          </div>
+          <div class="group">
+            <p class="group__title">Flags</p>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Disable hardware built-in media keys</h4>
+                <p>
+                  Also prevents certain desktop environments from recognizing the chrome MPRIS
+                  client separately from the custom MPRIS client.
+                </p>
              </div>
+              <label class="switch">
+                <input id="disableHardwareMediaKeys" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
            </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Enable GPU rasterization</h4>
+                <p>Move a part of the rendering to the GPU for increased performance.</p>
+              </div>
+              <label class="switch">
+                <input id="gpuRasterization" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Disable Background Throttling</h4>
+                <p>
+                  Makes app more responsive while in the background, at the cost of performance.
+                </p>
+              </div>
+              <label class="switch">
+                <input id="disableBackgroundThrottle" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Wayland support</h4>
+                <p>
+                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
+                </p>
+              </div>
+              <label class="switch">
+                <input id="enableWaylandSupport" type="checkbox" />
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+          </div>
        </section>

        <section id="theming-section" class="tabs__section">
@@ -347,21 +387,24 @@

        <section id="about-section" class="tabs__section about-section">
          <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
-          <p class="about-section__text">
-            <a class="external-link" data-url="https://github.com/Mastermindzh/tidal-hifi">TIDAL Hi-Fi</a>
-            is made by
-            <a class="external-link" data-url="https://www.rickvanlieshout.com">
-              Rick van Lieshout</a>. <br />It uses
-            <a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
-            version of Electron for widevine support.
-          </p>
+          <h4>TIDAL Hi-Fi</h4>
+          <div class="about-section__version">
+            <a href="">5.7.0</a>
+          </div>
+          <div class="about-section__links">
+            <a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i
+                class="fa fa-external-link"></i></a>
+            <a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i
+                class="fa fa-external-link"></i></a>
+            <a href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
+              class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
+          </div>
        </section>

        <footer class="footer">
          <p class="footer__note">
-            Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
+            <strong>Note</strong>: some settings may require a restart of TIDAL Hi-Fi.
          </p>
-          <button class="footer__button" id="restart">Restart TIDAL Hi-Fi</button>
        </footer>
      </div>
    </main>
--- a/src/pages/settings/settings.scss
+++ b/src/pages/settings/settings.scss
@@ -8,6 +8,7 @@ $tidal-grey: #72777f;
 $tidal-grey-darker: #404248;
 $tidal-grey-darker-focus: #55585f;
 $tidal-grey-darkest: #242528;
+$tidal-grey-darkest-focus: #2e2f33;

 // --- Fonts ---

@@ -309,26 +310,75 @@ html {
 }

 .about-section {
-  padding-top: 120px;
+  padding-top: 40px;
  text-align: center;

  &__icon {
    display: inline-block;
-    width: 100px;
+    width: 200px;
  }

  &__text {
    display: block;
-    max-width: 350px;
-    margin: 20px auto 0;
+    max-width: 500px;
+    margin: -15px auto 0;
+  }
+  &__table {
+    width: 120px;
+    margin: 0 auto 0;
+
+    td {
+      text-align: left;
+    }
+  }
+  &__version {
+    margin: -10px 0px 30px 0px;
+    a {
+      background-color: $tidal-grey-darker;
+      border: none;
+      color: $tidal-blue;
+      padding: 8px 20px;
+      font-weight: bold;
+      text-align: center;
+      text-decoration: none;
+      display: inline-block;
+      border-radius: 100px;
+    }
  }

-  // --- Footer ---
+  &__links {
+    width: 300px;
+    margin: 0 auto;
+    a {
+      border-radius: 10px;
+      border: none;
+      color: $white;
+      padding: 10px 10px 10px 20px;
+      margin: 8px;
+      text-align: left;
+      font-size: 16px;
+      line-height: 30px;
+      display: flex;
+      text-decoration: none;
+      justify-content: space-between;
+      background-color: $tidal-grey-darkest;
+
+      i {
+        color: $white;
+        line-height: 30px;
+        font-size: 18px;
+      }
+
+      &:hover {
+        background-color: $tidal-grey-darkest-focus;
+      }
+    }
+  }
 }

+// --- Footer ---
 .footer {
  position: sticky;
-  top: calc(100% - 120px);
  height: 100px;
  padding-top: 20px;
  text-align: center;
@@ -443,3 +493,7 @@ html {
    }
  }
 }
+
+.hidden {
+  display: none !important;
+}
--- a/src/pages/settings/theming.ts
+++ b/src/pages/settings/theming.ts
@@ -1,4 +1,5 @@
 import fs from "fs";
+import { Logger } from "../../features/logger";

 const cssFilter = (file: string) => file.endsWith(".css");
 const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase());
@@ -36,7 +37,7 @@ export const getThemeListFromDirectory = (directory: string): string[] => {
    makeUserThemesDirectory(directory);
    return fs.readdirSync(directory).filter(cssFilter).sort(sort);
  } catch (err) {
-    console.error(err);
+    Logger.log(`Failed to get files from ${directory}`, err);
    return [];
  }
 };
@@ -49,6 +50,6 @@ export const makeUserThemesDirectory = (directory: string) => {
  try {
    fs.mkdirSync(directory, { recursive: true });
  } catch (err) {
-    console.error(err);
+    Logger.log(`Failed to make user theme directory: ${directory}`, err);
  }
 };
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -1,28 +1,31 @@
 import { app, dialog, Notification } from "@electron/remote";
 import { clipboard, ipcRenderer } from "electron";
-import fs from "fs";
 import Player from "mpris-service";
 import { globalEvents } from "./constants/globalEvents";
 import { settings } from "./constants/settings";
-import { Songwhip } from "./features/songwhip/songwhip";
 import {
  ListenBrainz,
  ListenBrainzConstants,
  ListenBrainzStore,
 } from "./features/listenbrainz/listenbrainz";
+import { StoreData } from "./features/listenbrainz/models/storeData";
+import { Logger } from "./features/logger";
+import { Songwhip } from "./features/songwhip/songwhip";
+import { addCustomCss } from "./features/theming/theming";
+import { MediaStatus } from "./models/mediaStatus";
 import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
-import { StoreData } from "./features/listenbrainz/models/storeData";
-import { MediaStatus } from "./models/mediaStatus";

 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
-const appName = "Tidal Hifi";
+const appName = "TIDAL Hi-Fi";
 let currentSong = "";
 let player: Player;
 let currentPlayStatus = MediaStatus.paused;
+let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
+let scrobbleWaitingForDelay = false;

 const elements = {
  play: '*[data-test="play"]',
@@ -155,30 +158,6 @@ const elements = {
  },
 };

-function addCustomCss() {
-  window.addEventListener("DOMContentLoaded", () => {
-    const selectedTheme = settingsStore.get(settings.theme);
-    if (selectedTheme !== "none") {
-      const themeFile = `${process.resourcesPath}/${selectedTheme}`;
-      fs.readFile(themeFile, "utf-8", (err, data) => {
-        if (err) {
-          alert("An error ocurred reading the theme file.");
-          return;
-        }
-
-        const themeStyle = document.createElement("style");
-        themeStyle.innerHTML = data;
-        document.head.appendChild(themeStyle);
-      });
-    }
-
-    // read customCSS (it will override the theme)
-    const style = document.createElement("style");
-    style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
-    document.head.appendChild(style);
-  });
-}
-
 /**
 * Get the update frequency from the store
 * make sure it returns a number, if not use the default
@@ -392,6 +371,9 @@ function updateMpris(options: Options) {
  }
 }

+/**
+ * Update the listenbrainz service with new data based on a few conditions
+ */
 function updateListenBrainz(options: Options) {
  if (settingsStore.get(settings.ListenBrainz.enabled)) {
    const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
@@ -399,12 +381,22 @@ function updateListenBrainz(options: Options) {
      (!oldData && options.status === MediaStatus.playing) ||
      (oldData && oldData.title !== options.title)
    ) {
-      ListenBrainz.scrobble(
-        options.title,
-        options.artists,
-        options.status,
-        convertDuration(options.duration)
-      );
+      if (!scrobbleWaitingForDelay) {
+        scrobbleWaitingForDelay = true;
+        clearTimeout(currentListenBrainzDelayId);
+        currentListenBrainzDelayId = setTimeout(
+          () => {
+            ListenBrainz.scrobble(
+              options.title,
+              options.artists,
+              options.status,
+              convertDuration(options.duration)
+            );
+            scrobbleWaitingForDelay = false;
+          },
+          settingsStore.get(settings.ListenBrainz.delay) ?? 0
+        );
+      }
    }
  }
 }
@@ -528,8 +520,8 @@ setInterval(function () {
 if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
  try {
    player = Player({
-      name: "tidal-hifi",
-      identity: "tidal-hifi",
+      name: "TIDAL Hi-Fi",
+      identity: "TIDAL Hi-Fi",
      supportedUriSchemes: ["file"],
      supportedMimeTypes: [
        "audio/mpeg",
@@ -541,7 +533,6 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
      supportedInterfaces: ["player"],
      desktopEntry: "tidal-hifi",
    });
-
    // Events
    const events = {
      next: "next",
@@ -579,7 +570,8 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
    console.log("player api not working");
  }
 }
-addCustomCss();
+
+addCustomCss(app, Logger.bind(this));
 addHotKeys();
 addIPCEventListeners();
 addFullScreenListeners();
--- a/src/scripts/discord.ts
+++ b/src/scripts/discord.ts
@@ -1,8 +1,11 @@
 import { Client } from "discord-rpc";
 import { app, ipcMain } from "electron";
 import { globalEvents } from "../constants/globalEvents";
+import { settings } from "../constants/settings";
+import { Logger } from "../features/logger";
 import { MediaStatus } from "../models/mediaStatus";
 import { mediaInfo } from "./mediaInfo";
+import { settingsStore } from "./settings";

 const clientId = "833617820704440341";

@@ -15,7 +18,7 @@ function timeToSeconds(timeArray: string[]) {
 export let rpc: Client;

 const observer = () => {
-  if (mediaInfo.status == MediaStatus.paused && rpc) {
+  if (mediaInfo.status === MediaStatus.paused && rpc) {
    rpc.setActivity(idleStatus);
  } else if (rpc) {
    const currentSeconds = timeToSeconds(mediaInfo.current.split(":"));
@@ -23,17 +26,21 @@ const observer = () => {
    const date = new Date();
    const now = (date.getTime() / 1000) | 0;
    const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+    const detailsPrefix =
+      settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
+    const buttonText =
+      settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
    if (mediaInfo.url) {
      rpc.setActivity({
        ...idleStatus,
        ...{
-          details: `Listening to ${mediaInfo.title}`,
+          details: `${detailsPrefix}${mediaInfo.title}`,
          state: mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)",
          startTimestamp: now,
          endTimestamp: remaining,
          largeImageKey: mediaInfo.image,
          largeImageText: mediaInfo.album ? mediaInfo.album : `${idleStatus.largeImageText}`,
-          buttons: [{ label: "Play on Tidal", url: mediaInfo.url }],
+          buttons: [{ label: buttonText, url: mediaInfo.url }],
        },
      });
    } else {
@@ -53,7 +60,7 @@ const observer = () => {
 const idleStatus = {
  details: `Browsing Tidal`,
  largeImageKey: "tidal-hifi-icon",
-  largeImageText: `Tidal HiFi ${app.getVersion()}`,
+  largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
  instance: false,
 };

@@ -70,7 +77,7 @@ export const initRPC = () => {
      ipcMain.on(globalEvents.updateInfo, observer);
    },
    () => {
-      console.error("Can't connect to Discord, is it running?");
+      Logger.log("Can't connect to Discord, is it running?");
    }
  );
 };
--- a/src/scripts/express.ts
+++ b/src/scripts/express.ts
@@ -8,7 +8,7 @@ import { mediaInfo } from "./mediaInfo";
 import { settingsStore } from "./settings";

 /**
- * Function to enable tidal-hifi's express api
+ * Function to enable TIDAL Hi-Fi's express api
 */

 // expressModule.run = function (mainWindow)
--- a/src/scripts/menu.ts
+++ b/src/scripts/menu.ts
@@ -33,7 +33,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
          {
            label: name,
            submenu: [
-              { role: "about" },
              settingsMenuEntry,
              { type: "separator" },
              { role: "services" },
@@ -101,12 +100,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
      ],
    },
    settingsMenuEntry,
-    {
-      label: "About",
-      click() {
-        showSettingsWindow("about");
-      },
-    },
    toggleWindow,
    quitMenuEntry,
  ];
--- a/src/scripts/settings.ts
+++ b/src/scripts/settings.ts
@@ -1,8 +1,8 @@
 import Store from "electron-store";

-import { settings } from "../constants/settings";
-import path from "path";
 import { BrowserWindow } from "electron";
+import path from "path";
+import { settings } from "../constants/settings";

 let settingsWindow: BrowserWindow;

@@ -18,14 +18,20 @@ export const settingsStore = new Store({
    disableHardwareMediaKeys: false,
    enableCustomHotkeys: false,
    enableDiscord: false,
+    discord: {
+      detailsPrefix: "Listening to ",
+      buttonText: "Play on Tidal",
+    },
    ListenBrainz: {
      enabled: false,
      api: "https://api.listenbrainz.org",
      token: "",
+      delay: 5000,
    },
    flags: {
-      gpuRasterization: true,
      disableHardwareMediaKeys: false,
+      enableWaylandSupport: true,
+      gpuRasterization: true,
    },
    menuBar: true,
    minimizeOnClose: false,
@@ -48,6 +54,13 @@ export const settingsStore = new Store({
        migrationStore.get("disableHardwareMediaKeys") ?? false
      );
    },
+    "5.7.0": (migrationStore) => {
+      console.log("running migrations for 5.7.0");
+      migrationStore.set(
+        settings.ListenBrainz.delay,
+        migrationStore.get(settings.ListenBrainz.delay) ?? 5000
+      );
+    },
  },
 });

@@ -58,8 +71,8 @@ const settingsModule = {

 export const createSettingsWindow = function () {
  settingsWindow = new BrowserWindow({
-    width: 700,
-    height: 600,
+    width: 650,
+    height: 700,
    resizable: true,
    show: false,
    transparent: true,
--- a/src/themes/Tokyo
+++ b/src/themes/Tokyo
@@ -74,7 +74,7 @@ button.feedBell--kvAbD {
 .container--PFTHk {
  background-color: var(--right-queue-background);
 }
-.container--cl4MJ{
+.container--cl4MJ {
  background-color: var(--search-background);
 }
 .searchFieldHighlighted--Fitvs {
@@ -83,3 +83,122 @@ button.feedBell--kvAbD {
 .searchField--EGBSq {
  background-color: var(--search-background);
 }
+
+// Settings window styling
+
+.settings-window {
+  color: var(--sidebar-menu-playlist-text);
+}
+.settings-window__wrapper {
+  background: var(--main-background);
+  box-shadow: inset 0 0 2px 0 var(--main-feed-button-background);
+}
+
+.settings-window__close-button:hover {
+  background: var(--main-feed-button-background);
+}
+
+.settings input:checked + label {
+  border-bottom: 2px solid var(--player-control-active-button);
+  color: var(--player-control-active-button);
+}
+
+.tabs::-webkit-scrollbar-thumb {
+  background-color: #404248;
+  box-shadow: inset 0 0 10px 2px var(--search-background);
+}
+
+.group {
+  border-bottom: 1px solid #333;
+}
+
+.group__description p {
+  color: var(--sidebar-menu-top-text);
+}
+.group__description .text-input {
+  border-bottom: solid 1px #333;
+  color: var(--sidebar-menu-top-text);
+}
+.group__description .text-input:focus {
+  border-color: var(--player-control-active-button);
+  color: var(--sidebar-menu-playlist-text);
+}
+
+.switch input:checked + .switch__slider {
+  background-color: var(--player-control-active-button);
+}
+.switch input:checked + .switch__slider::before {
+  background-color: var(--sidebar-menu-playlist-text);
+}
+.switch input:focus + .switch__slider {
+  box-shadow: inset 0 0 0 1px var(--player-control-active-button);
+}
+.switch__slider {
+  background-color: var(--search-background);
+}
+.switch__slider::before {
+  background-color: var(--sidebar-menu-playlist-text);
+}
+
+.textarea {
+  background: var(--search-background);
+  color: var(--sidebar-menu-top-text);
+}
+.textarea:focus {
+  border-color: var(--player-control-active-button);
+  color: var(--sidebar-menu-playlist-text);
+}
+
+.about-section__version a {
+  background-color: #404248;
+  color: var(--player-control-active-button);
+}
+.about-section__links a {
+  color: var(--sidebar-menu-playlist-text);
+
+  background-color: var(--search-background);
+}
+.about-section__links a i {
+  color: var(--sidebar-menu-playlist-text);
+}
+.about-section__links a:hover {
+  background-color: var(--player-control-favorite);
+}
+
+.footer__note {
+  color: var(--sidebar-menu-top-text);
+}
+.footer__button {
+  background: #404248;
+  color: var(--sidebar-menu-playlist-text);
+}
+.footer__button:hover {
+  background: #55585f;
+}
+
+.file-drop-area {
+  border: 1px dashed var(--sidebar-menu-top-text);
+}
+.file-drop-area.is-active {
+  background-color: #17171a;
+}
+
+.file-btn {
+  background-color: #17171a;
+  border: 1px solid var(--sidebar-menu-top-text);
+}
+
+.select-input {
+  border-bottom: solid 1px #333;
+  color: var(--sidebar-menu-top-text);
+}
+.select-input:focus {
+  border-color: var(--player-control-active-button);
+  color: var(--sidebar-menu-playlist-text);
+}
+.select-input option {
+  background-color: var(--search-background);
+}
+.select-input option:disabled {
+  color: var(--sidebar-menu-playlist-text);
+}
Author	SHA1	Message	Date
Rick van Lieshout	33070c157a	Merge pull request #281 from Mastermindzh/feature/update 5.7.0	2023-08-28 22:17:37 +02:00
Mastermindzh	eb91b66ac6	feat: Custom CSS now also applies to settings window	2023-08-28 16:38:08 +02:00
Mastermindzh	68f76a9e63	feat: The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting	2023-08-28 14:19:12 +02:00
Mastermindzh	cbb22ba688	fix: removed calls to restart function	2023-08-28 11:14:13 +02:00
Rick van Lieshout	3df82b93db	Merge pull request #279 from Mastermindzh/snyk-upgrade-e43be58e4e7a5f073bb845196cc13d2b [Snyk] Upgrade hotkeys-js from 3.11.2 to 3.12.0	2023-08-24 10:23:17 +02:00
snyk-bot	789ba83936	fix: upgrade hotkeys-js from 3.11.2 to 3.12.0 Snyk has created this PR to upgrade hotkeys-js from 3.11.2 to 3.12.0. See this package in npm: https://www.npmjs.com/package/hotkeys-js See this project in Snyk: https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr	2023-08-23 23:27:39 +00:00
Mastermindzh	a962029b0b	Restyled settings menu to include version number and useful links on the about page. fixes #275	2023-08-23 20:40:02 +02:00
Mastermindzh	d8e4a493b9	feat: Added settings to customize the Discord rich presence information	2023-08-21 16:24:16 +02:00
Mastermindzh	3d0b38361a	chore: naming	2023-08-20 15:43:11 +02:00
Rick van Lieshout	1c7385fa50	Merge pull request #276 from Mar0xy/docs/update-picture Update integrations picture	2023-08-20 14:26:05 +02:00
Rick van Lieshout	510812f384	Merge branch 'feature/update' into docs/update-picture	2023-08-20 14:25:56 +02:00
Mastermindzh	5144f67fbc	fixing build issues	2023-08-20 14:08:08 +02:00
Mastermindzh	81b81580c6	new icon look	2023-08-20 12:10:23 +02:00
Mastermindzh	534547ce67	Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into feature/update	2023-08-20 11:28:36 +02:00
Marie	1610e3cc05	merge conflict 101	2023-08-19 19:51:23 +02:00
Marie	e50e7de12e	Merge branch 'feature/update' into docs/update-picture	2023-08-19 19:45:51 +02:00
Marie	42be522b8e	Update integrations picture	2023-08-19 07:22:09 +02:00
Mastermindzh	40d80e0872	made sure all windows run with the same web preferences set	2023-08-14 21:26:09 +02:00
Mastermindzh	239139e674	updated name to TIDAL Hi-Fi	2023-08-14 21:20:53 +02:00
Rick van Lieshout	dc87b20ab8	Merge pull request #265 from Mastermindzh/feature/5.6.0 Feature/5.6.0	2023-08-12 15:42:27 +02:00
Mastermindzh	c7b3921514	Added app suspension inhibitors when music is playing. fixes #257	2023-08-12 15:02:23 +02:00
Rick van Lieshout	89f1ff4228	Create SECURITY.md	2023-08-12 14:30:10 +02:00
Mastermindzh	a0c73596e4	feat: added wayland support. fixes #262 #157	2023-08-07 20:48:29 +02:00
Mastermindzh	aa17d80450	added new quality names to readme + added neptune mention. fixes #261	2023-08-07 20:28:14 +02:00
Mastermindzh	5ea3972053	fixed errors with user theme files loading	2023-08-07 20:04:06 +02:00
Mastermindzh	4b81378423	fixed feature flag parsing & setting	2023-08-07 19:48:29 +02:00
Mastermindzh	c7931cf913	simplified logger	2023-08-07 19:45:44 +02:00