Pr dest (#166)

* Update configuration of the desktop file (#165)

* - Changed the category of the desktop file to AudioVideo
- Changed desktop file name to "TIDAL Hi-Fi"

Co-authored-by: Ivo Šmerek <ivo97@centrum.cz>

.github/workflows/build.yml

@@ -9,10 +9,14 @@ jobs:
   build_on_linux:
     runs-on: ubuntu-latest
     steps:
+      - name: update apt
+        run: sudo apt-get update
+      - name: Install libarchive-tools
+        run: sudo apt-get install -y libarchive-tools
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -22,7 +26,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -32,6 +36,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build

.github/workflows/release.yml

@@ -9,10 +9,14 @@ jobs:
   build_on_linux:
     runs-on: ubuntu-latest
     steps:
+      - name: update apt
+        run: sudo apt-get update
+      - name: Install libarchive-tools
+        run: sudo apt-get install -y libarchive-tools
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -26,7 +30,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -40,7 +44,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 12
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "cSpell.words": ["hifi", "rescrobbler", "widevine"]
+}

CHANGELOG.md

@@ -4,10 +4,110 @@ 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).
 
+## 4.1.2
+
+- Changed the category of the desktop file to AudioVideo
+- Changed desktop file name to "TIDAL Hi-Fi"
+
+## 4.1.1
+
+- Fixed `cannot read property of undefined` error because of not passing mainWindow around.
+- vincens2005, fixed inconsistent auto muting
+
+## 4.1.0
+
+- Added `tidal://` protocol support
+- Switched icon strategies to fix bugs with icons
+- Fixed tray icon bugs
+  - Menu now shows in KDE as well
+  - Toggle window is supported from tray icon
+  - regular click is still ignored, see [this issue](https://github.com/electron/electron/issues/6773)
+- Fixed about tab not showing
+- Fixed playback, mpris and API issues
+
+## 4.0.1
+
+- Updated build config to make use of a base file that doesn't build anything.
+  - This fixes the issue of unwanted extra build targets that were introduced with the electron-builder update
+
+## 4.0.0
+
+- Updated to Electron 19.0.5
+
+## 3.1.1
+
+- Media update timeout set to 500 instead of 200
+- Updated property name for duration because of a tidal update
+- flag for "disable hardware media keys" now working again
+
+## 3.1.0
+
+- Added a separate advanced options settings panel with flags
+  - Added gpu-rasterization flag
+- config setting `disableHardwareMediaKeys` moved to `flags.disableHardwareMediaKeys`, it will be migrated automatically
+
+## 3.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 HardwareMediaKeyHandling (defaults to false)
+
+## 2.8.2
+
+- Updated dependencies
+- Downgraded packaged version of electron to 8.5.2, doesn't seem to like a newer build
+- Fixed the annoying (and useless) terminal warning about `allowRendererProcessReuse`
+
+## 2.8.1
+
+- Mar0xy fixed some build issues (thanks!)
+- vincens2005 fixed the quit button in the menubar
+
+## 2.8.0
+
+- Added the ability to mute artists automatically
+- Added better error handling for discord rpc
+
+## 2.7.2
+
+- Disabled sandboxing to fix a display compositor issue on Linux.
+
+## 2.7.1
+
+- Fixed bug: Triggering full screen from the Tidal web app would cause the menubar to be visible even if it was disabled in the settings
+
+## 2.7.0
+
+- Switched to the native Notifier (removed node-notifier)
+- Album art now also has a name, based on [best effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847)
+
+## 2.6.0
+
+- Add album images to media info and discord
+
+## 2.5.0
+
+- Notify-send now correctly shows "Tidal HiFi" as the program name
+- Updated dependencies (including electron itself)
+
+### known issues
+
+- Requires older version of nodejs due to electron-builder (use lts/gallium)
+
+### builds
+
+updated to nodejs 16 in actions
+
+## 2.4.0
+
+- Added more MPRIS settings
+- Added instruction for rescrobbler to get last.fm working without sandbox mode
+
 ## 2.3.0
 
 - Added a setting to minimize to tray on app close (off by default)
-- Added the main menu to the trayicon
+- Added the main menu to the tray icon
 
 ## 2.2.1
 
@@ -21,10 +121,10 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
 ## 2.2.0
 
 - The discord integration now adds a time remaining field based on the song duration
-- All fields (current, remaining, and url are also available in the API*)
+- All fields (current, remaining, and url are also available in the API\*)
 - the artist field is now correctly identified
 
-* current time only updates on play/pause.
+\* current time only updates on play/pause.
 
 ## 2.1.1
 
@@ -49,7 +149,7 @@ moved to: [https://github.com/Mastermindzh/tidal-hifi-aur](https://github.com/Ma
 
 ## 1.3.0
 
--- re-enabled mpris-service wit the electron downloader fixes
+-- re-enabled MPRIS-service wit the electron downloader fixes
 
 ## 1.2.0
 
@@ -64,7 +164,7 @@ Bugfixes:
 ## 1.1.0
 
 - updated to electron 8.0.0
-- Added a beta-version of the mpris service
+- Added a beta-version of the MPRIS service
 
 - Bugfixes:
   - icon on gnome not showing in launcher

README.md

@@ -12,22 +12,23 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 <!-- toc -->
 
 - [Installation](#installation)
-  - [Using releases](#using-releases)
+  * [Using releases](#using-releases)
-    - [Snap install](#snap-install)
+  * [Snap](#snap)
-  - [Arch Linux](#arch-linux)
+  * [Arch Linux](#arch-linux)
-  - [Using source](#using-source)
+  * [Flatpak](#flatpak)
-- [features](#features)
+  * [Nix](#nix)
+  * [Using source](#using-source)
+- [Features](#features)
 - [Integrations](#integrations)
-  - [not included](#not-included)
+  * [Known bugs](#known-bugs)
-  - [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)
-    - [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)
 - [Why](#why)
 - [Why not extend existing projects?](#why-not-extend-existing-projects)
 - [Special thanks to...](#special-thanks-to)
 - [Buy me a coffee? Please don't](#buy-me-a-coffee-please-dont)
 - [Images](#images)
-  - [settings window](#settings-window)
+  * [Settings window](#settings-window)
-  - [user setups](#user-setups)
+  * [User setups](#user-setups)
 
 <!-- tocstop -->
 
@@ -37,7 +38,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 
 Various packaged versions of the software are available on the [releases](https://github.com/Mastermindzh/tidal-hifi/releases) tab.
 
-#### Snap install
+### Snap
 
 To install with `snap` you need to download the pre-packaged snap-package from this repository, found under releases:
 
@@ -58,7 +59,23 @@ snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
 Arch Linux users can use the AUR to install tidal-hifi:
 
 ```sh
-trizen tidal-hifi
+trizen tidal-hifi-bin
+```
+
+### Flatpak
+
+To install via [Flatpak](https://flathub.org/apps/details/com.mastermindzh.tidal-hifi) run the following command:
+
+```sh
+flatpak install flathub com.mastermindzh.tidal-hifi
+```
+
+### Nix
+
+To install with Nix run the following command:
+
+```sh
+nix-env -iA nixpkgs.tidal-hifi
 ```
 
 ### Using source
@@ -70,14 +87,16 @@ To install and work with the code on this project follow these steps:
 - npm install
 - npm start
 
-## features
+## Features
 
 - HiFi playback
 - Notifications
 - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
 - API for status and playback
+- [Mute artists automatically (defaults to "Tidal")]("./docs/muting-artists.md")
 - Custom [integrations](#integrations)
-- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=`)
+- [Settings feature](./docs/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))
 
 ## Integrations
 
@@ -88,10 +107,10 @@ You can find these in the settings menu (`ctrl + =` by default) under the "integ
 
 It currently includes:
 
-- mpris - mpris media player controls/status
+- MPRIS - MPRIS media player controls/status
 - Discord - Shows what you're listening to on Discord.
 
-### not included
+Not included:
 
 - [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
 
@@ -127,16 +146,16 @@ Sometimes it's just easier to start over, cover my own needs and then making it
 
 ## Buy me a coffee? Please don't
 
-Instead spend some money on a charity I care for: [kwf.nl](https://secure.kwf.nl/donation).
+Instead spend some money on a charity I care for: [kwf.nl](https://www.kwf.nl/donatie/donation).
 Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
 
 ## Images
 
-### settings window
+### Settings window
 
 ![settings window](./docs/settings-preview.png)
 
-### user setups
+### User setups
 
 Some of our users are kind enough to share their usage pictures.
 If you want to see them or possibly even add one please do so in the following issue: [#3 - image thread](https://github.com/Mastermindzh/tidal-hifi/issues/3).

build/electron-builder.base.yml

@@ -0,0 +1,39 @@
+appId: com.rickvanlieshout.tidal-hifi
+electronVersion: 19.0.5
+electronDownload:
+  version: 19.0.5+wvcus
+  mirror: https://github.com/castlabs/electron-releases/releases/download/v
+snap:
+  plugs:
+    - default
+    - screen-inhibit-control
+linux:
+  category: AudioVideo
+  target:
+    - dir
+  executableName: tidal-hifi
+  desktop:
+    Encoding: UTF-8
+    Name: TIDAL Hi-Fi
+    GenericName: TIDAL Hi-Fi
+    Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
+    Icon: icon.png
+    StartupNotify: true
+    Terminal: false
+    Type: Application
+    Categories: Network;Application;AudioVideo;Audio;Video
+    StartupWMClass: tidal-hifi
+    X-PulseAudio-Properties: media.role=music
+    MimeType: x-scheme-handler/tidal;
+
+mac:
+  category: public.app-category.entertainment
+win:
+  icon: icon.png
+  artifactName: "tidalhifi"
+  appId: com.rickvanlieshout.tidalhifi
+  executableName: tidalhifi
+protocols:
+  name: "tidal"
+  role: "Viewer"
+  schemes: ["tidal"]

build/electron-builder.deb.yml

@@ -1,6 +1,6 @@
-extends: ./build/electron-builder.yml
+extends: ./build/electron-builder.base.yml
 linux:
   category: Audio
-  icon: ./assets/icon.png
+  icon: icon.png
   target:
     - deb

build/electron-builder.pacman.yml

@@ -1,6 +1,6 @@
-extends: ./build/electron-builder.yml
+extends: ./build/electron-builder.base.yml
 linux:
   category: Audio
-  icon: ./assets/icon.png
+  icon: icon.png
   target:
     - pacman

build/electron-builder.rpm.yml

@@ -1,6 +1,6 @@
-extends: ./build/electron-builder.yml
+extends: ./build/electron-builder.base.yml
 linux:
-    category: Audio
+  category: Audio
-    icon: ./assets/TIDAL.icns
+  icon: icon.png
-    target:
+  target:
-        - rpm
+    - rpm

build/electron-builder.snap.yml

@@ -1,6 +1,6 @@
-extends: ./build/electron-builder.yml
+extends: ./build/electron-builder.base.yml
 linux:
   category: Audio
-  icon: ./assets/icon.png
+  icon: icon.png
   target:
     - snap

build/electron-builder.unpacked.yml

@@ -0,0 +1,4 @@
+extends: ./build/electron-builder.base.yml
+linux:
+  target:
+    - dir

build/electron-builder.yml

@@ -1,36 +1,20 @@
-appId: com.rickvanlieshout.tidal-hifi
+electronVersion: 19.0.5
-electronVersion: 8.5.2
 electronDownload:
-  version: 8.5.2-wvvmp
+  version: 19.0.5+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
-snap:
-  plugs:
-    - default
-    - screen-inhibit-control
 linux:
   category: Audio
   target:
-    # - pacman
+    - pacman
     - tar.gz
     - deb
     - rpm
     - AppImage
     - snap
     - freebsd
-  executableName: tidal-hifi
-  desktop:
-    Encoding: UTF-8
-    Name: tidal-hifi
-    GenericName: tidal-hifi
-    Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
-    Icon: assets/icon.png
-    StartupNotify: true
-    Terminal: false
-    Type: Application
-    Categories: Network;Application;Audio;Video
-    StartupWMClass: tidal-hifi
-    X-PulseAudio-Properties: media.role=music
-mac:
-  category: public.app-category.entertainment
 win:
   target: msi
+  icon: icon.png
+  artifactName: "tidalhifi"
+  appId: com.rickvanlieshout.tidalhifi
+  executableName: tidalhifi

docs/muting-artists.md

@@ -0,0 +1,11 @@
+# Muting artists
+
+If you feel that some of your music is embarrassing for others you can mute specific artists in the settings window.
+This functionality is inspired by the [adblock ticket](https://github.com/Mastermindzh/tidal-hifi/issues/112), and whilst I personally feel you should simply buy Tidal, I also believe in muting sound that you don't want to hear.
+
+Anyway, to block an artist, open the settings window (see image below) and enter a list of artists in the textarea as seen below.
+Don't forget to turn the feature on and Tidal-hifi will automatically mute the player whenever that artist is playing.
+
+This will allow you to skip the song without anyone noticing. (you can always say "no idea, it seems to have no audio").
+
+![muted artists settings window](./settings-muted-artists.png)

package.json

@@ -1,17 +1,19 @@
 {
   "name": "tidal-hifi",
-  "version": "2.4.0",
+  "version": "4.1.2",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "src/main.js",
   "scripts": {
     "start": "electron .",
     "build": "electron-builder --publish=never -c ./build/electron-builder.yml",
     "build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml",
+    "build-unpacked": "electron-builder --publish=never -c ./build/electron-builder.unpacked.yml",
     "build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml",
     "build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml",
     "build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml",
     "build-wl": "electron-builder --publish=never -c ./build/electron-builder.yml -wl",
-    "build-mac": "electron-builder --publish=never -c ./build/electron-builder.yml -m"
+    "build-mac": "electron-builder --publish=never -c ./build/electron-builder.yml -m",
+    "build-base": "electron-builder --publish=never -c ./build/electron-builder.base.yml"
   },
   "keywords": [
     "electron",
@@ -23,21 +25,19 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "discord-rpc": "^3.2.0",
+    "@electron/remote": "^2.0.8",
-    "electron-store": "^5.1.1",
+    "discord-rpc": "^4.0.1",
-    "express": "^4.17.1",
+    "electron-store": "^8.1.0",
-    "hotkeys-js": "^3.7.6",
+    "express": "^4.18.1",
-    "mpris-service": "^2.1.0",
+    "hotkeys-js": "^3.9.4",
-    "node-notifier": "^9.0.1",
+    "mpris-service": "^2.1.2",
     "request": "^2.88.2"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "dot-prop": ">=4.2.1",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v19.0.5+wvcus",
-    "electron": "git+https://github.com/castlabs/electron-releases.git#v10.4.3-wvvmp",
+    "electron-builder": "^23.3.3",
-    "electron-builder": "^21.2.0",
+    "prettier": "^2.7.1"
-    "electron-reload": "^1.5.0",
-    "prettier": "^2.0.4"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

src/constants/flags.js

@@ -0,0 +1,6 @@
+const flags = {
+  gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
+  disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
+};
+
+module.exports = flags;

src/constants/globalEvents.js

@@ -6,6 +6,7 @@ const globalEvents = {
   previous: "previous",
   updateInfo: "update-info",
   hideSettings: "hideSettings",
+  refreshMenuBar: "refreshMenubar",
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",

src/constants/settings.js

@@ -13,10 +13,18 @@ const settings = {
   api: "api",
   menuBar: "menuBar",
   playBackControl: "playBackControl",
+  muteArtists: "muteArtists",
+  mutedArtists: "mutedArtists",
   apiSettings: {
     root: "apiSettings",
     port: "apiSettings.port",
   },
+  singleInstance: "singleInstance",
+  disableHardwareMediaKeys: "disableHardwareMediaKeys",
+  flags: {
+    disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
+    gpuRasterization: "flags.gpuRasterization",
+  },
   mpris: "mpris",
   enableCustomHotkeys: "enableCustomHotkeys",
   trayIcon: "trayIcon",

src/constants/values.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: "tidal-hifi",
+};

src/main.js

@@ -1,4 +1,5 @@
-const { app, BrowserWindow, globalShortcut, ipcMain } = require("electron");
+require("@electron/remote/main").initialize();
+const { app, BrowserWindow, components, globalShortcut, ipcMain, protocol } = require("electron");
 const {
   settings,
   store,
@@ -16,17 +17,56 @@ const mediaKeys = require("./constants/mediaKeys");
 const mediaInfoModule = require("./scripts/mediaInfo");
 const discordModule = require("./scripts/discord");
 const globalEvents = require("./constants/globalEvents");
+const flagValues = require("./constants/flags");
 
 let mainWindow;
 let icon = path.join(__dirname, "../assets/icon.png");
+const PROTOCOL_PREFIX = "tidal";
+
+setFlags();
+
+function setFlags() {
+  const flags = store.get().flags;
+  if (flags) {
+    for (const [key, value] of Object.entries(flags)) {
+      if (value) {
+        flagValues[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");
+}
 
 /**
- * Enable live reload in development builds
+ * Update the menuBarVisbility according to the store value
+ *
  */
-if (!app.isPackaged) {
+function syncMenuBarWithStore() {
-  require("electron-reload")(`${__dirname}`, {
+  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
-    electron: require(`${__dirname}/../node_modules/electron`),
+}
-  });
+
+/**
+ * Determine whether the current window is the main window
+ * if singleInstance is requested.
+ * If singleInstance isn't requested simply return true
+ * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
+ */
+function isMainInstanceOrMultipleInstancesAllowed() {
+  if (store.get(settings.singleInstance)) {
+    const gotTheLock = app.requestSingleInstanceLock();
+
+    if (!gotTheLock) {
+      return false;
+    }
+  }
+  return true;
 }
 
 function createWindow(options = {}) {
@@ -37,18 +77,16 @@ function createWindow(options = {}) {
     width: store && store.get(settings.windowBounds.width),
     height: store && store.get(settings.windowBounds.height),
     icon,
-    tray: true,
     backgroundColor: options.backgroundColor,
     webPreferences: {
-      affinity: "window",
       preload: path.join(__dirname, "preload.js"),
       plugins: true,
       devTools: true, // I like tinkering, others might too
-      enableRemoteModule: true,
     },
   });
-
+  require("@electron/remote/main").enable(mainWindow.webContents);
-  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+  registerHttpProtocols();
+  syncMenuBarWithStore();
 
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
@@ -76,6 +114,13 @@ function createWindow(options = {}) {
   });
 }
 
+function registerHttpProtocols() {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request, _callback) => {
+    mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
+  });
+  app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
+}
+
 function addGlobalShortcuts() {
   Object.keys(mediaKeys).forEach((key) => {
     globalShortcut.register(`${key}`, () => {
@@ -87,14 +132,20 @@ function addGlobalShortcuts() {
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on("ready", () => {
+app.on("ready", async () => {
-  createWindow();
+  if (isMainInstanceOrMultipleInstancesAllowed()) {
-  addMenu();
+    await components.whenReady();
-  createSettingsWindow();
+    createWindow();
-  addGlobalShortcuts();
+    addMenu(mainWindow);
-  store.get(settings.trayIcon) && addTray({ icon }) && refreshTray();
+    createSettingsWindow();
-  store.get(settings.api) && expressModule.run(mainWindow);
+    addGlobalShortcuts();
-  store.get(settings.enableDiscord) && discordModule.initRPC();
+    store.get(settings.trayIcon) && addTray(mainWindow, { icon }) && refreshTray();
+    store.get(settings.api) && expressModule.run(mainWindow);
+    store.get(settings.enableDiscord) && discordModule.initRPC();
+    // mainWindow.webContents.openDevTools();
+  } else {
+    app.quit();
+  }
 });
 
 app.on("activate", function () {
@@ -105,20 +156,28 @@ app.on("activate", function () {
   }
 });
 
+app.on("browser-window-created", (_, window) => {
+  require("@electron/remote/main").enable(window.webContents);
+});
+
 // IPC
-ipcMain.on(globalEvents.updateInfo, (event, arg) => {
+ipcMain.on(globalEvents.updateInfo, (_event, arg) => {
   mediaInfoModule.update(arg);
 });
 
-ipcMain.on(globalEvents.hideSettings, (event, arg) => {
+ipcMain.on(globalEvents.hideSettings, (_event, _arg) => {
   hideSettingsWindow();
 });
-ipcMain.on(globalEvents.showSettings, (event, arg) => {
+ipcMain.on(globalEvents.showSettings, (_event, _arg) => {
   showSettingsWindow();
 });
 
-ipcMain.on(globalEvents.storeChanged, (event, arg) => {
+ipcMain.on(globalEvents.refreshMenuBar, (_event, _arg) => {
-  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
+  syncMenuBarWithStore();
+});
+
+ipcMain.on(globalEvents.storeChanged, (_event, _arg) => {
+  syncMenuBarWithStore();
 
   if (store.get(settings.enableDiscord) && !discordModule.rpc) {
     discordModule.initRPC();
@@ -127,6 +186,6 @@ ipcMain.on(globalEvents.storeChanged, (event, arg) => {
   }
 });
 
-ipcMain.on(globalEvents.error, (event, arg) => {
+ipcMain.on(globalEvents.error, (event, _arg) => {
   console.log(event);
 });

src/pages/settings/preload.js

@@ -1,13 +1,24 @@
-let notifications;
+let trayIcon,
-let playBackControl;
+  minimizeOnClose,
-let api;
+  mpris,
-let port;
+  enableCustomHotkeys,
-let menuBar;
+  enableDiscord,
+  muteArtists,
+  notifications,
+  playBackControl,
+  api,
+  port,
+  menuBar,
+  mutedArtists,
+  singleInstance,
+  disableHardwareMediaKeys,
+  gpuRasterization;
 
 const { store, settings } = require("./../../scripts/settings");
 const { ipcRenderer } = require("electron");
 const globalEvents = require("./../../constants/globalEvents");
-
+const remote = require("@electron/remote");
+const { app } = remote;
 /**
  * Sync the UI forms with the current settings
  */
@@ -22,31 +33,35 @@ function refreshSettings() {
   enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
   enableDiscord.checked = store.get(settings.enableDiscord);
   minimizeOnClose.checked = store.get(settings.minimizeOnClose);
+  muteArtists.checked = store.get(settings.muteArtists);
+  mutedArtists.value = store.get(settings.mutedArtists).join("\n");
+  singleInstance.checked = store.get(settings.singleInstance);
+  disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
+  gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
 }
 
 /**
  * Open an url in the default browsers
  */
-window.openExternal = function (url) {
+function openExternal(url) {
   const { shell } = require("electron");
   shell.openExternal(url);
-};
+}
 
 /**
  * hide the settings window
  */
-window.hide = function () {
+function hide() {
   ipcRenderer.send(globalEvents.hideSettings);
-};
+}
 
 /**
  * Restart tidal-hifi after changes
  */
-window.restart = function () {
+function restart() {
-  const remote = require("electron").remote;
+  app.relaunch();
-  remote.app.relaunch();
+  app.quit();
-  remote.app.exit(0);
+}
-};
 
 /**
  * Bind UI components to functions after DOMContentLoaded
@@ -56,8 +71,16 @@ window.addEventListener("DOMContentLoaded", () => {
     return document.getElementById(id);
   }
 
+  document.getElementById("close").addEventListener("click", hide);
+  document.getElementById("restart").addEventListener("click", restart);
+  document.querySelectorAll("#openExternal").forEach((elem) =>
+    elem.addEventListener("click", function (event) {
+      openExternal(event.target.getAttribute("data-url"));
+    })
+  );
+
   function addInputListener(source, key) {
-    source.addEventListener("input", function (event, data) {
+    source.addEventListener("input", function (_event, _data) {
       if (this.value === "on") {
         store.set(key, source.checked);
       } else {
@@ -67,6 +90,13 @@ window.addEventListener("DOMContentLoaded", () => {
     });
   }
 
+  function addTextAreaListener(source, key) {
+    source.addEventListener("input", function (_event, _data) {
+      store.set(key, source.value.split("\n"));
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
   ipcRenderer.on("refreshData", () => {
     refreshSettings();
   });
@@ -85,6 +115,11 @@ window.addEventListener("DOMContentLoaded", () => {
   mpris = get("mprisCheckbox");
   enableCustomHotkeys = get("enableCustomHotkeys");
   enableDiscord = get("enableDiscord");
+  muteArtists = get("muteArtists");
+  mutedArtists = get("mutedArtists");
+  singleInstance = get("singleInstance");
+  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
+  gpuRasterization = get("gpuRasterization");
 
   refreshSettings();
 
@@ -98,4 +133,9 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
   addInputListener(enableDiscord, settings.enableDiscord);
   addInputListener(minimizeOnClose, settings.minimizeOnClose);
+  addInputListener(muteArtists, settings.muteArtists);
+  addTextAreaListener(mutedArtists, settings.mutedArtists);
+  addInputListener(singleInstance, settings.singleInstance);
+  addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
+  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
 });

src/pages/settings/settings.html

@@ -2,472 +2,557 @@
 <html lang="en">
 
 <head>
-    <meta charset="UTF-8" />
+  <title>Tidal-hifi settings</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
 </head>
 
 <body>
-    <div class="header">
+  <div class="header">
-        <h1 class="title">Settings</h1>
+    <h1 class="title">Settings</h1>
-        <a href="javascript:hide();" class="exitWindow">
+    <a id="close" style="cursor: pointer;" class="exitWindow">
 
-            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334">
+      <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334">
-                <g>
+        <g>
-                    <path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
+          <path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
               c-7.844,7.844-18.128,11.769-28.407,11.769c-10.296,0-20.581-3.919-28.419-11.769L174.167,231.003L68.609,336.563
               c-7.843,7.844-18.128,11.769-28.416,11.769c-10.285,0-20.563-3.919-28.413-11.769c-15.699-15.698-15.699-41.139,0-56.85
               l105.54-105.549L11.774,68.611c-15.699-15.699-15.699-41.145,0-56.844c15.696-15.687,41.127-15.687,56.829,0l105.563,105.554
               L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z" />
-            </svg>
+      </svg>
 
-        </a>
+    </a>
-    </div>
+  </div>
-    <div class="body">
+  <div class="body">
-        <div class="tabset">
+    <div class="tabset">
-            <!-- Tab 1 -->
-            <input type="radio" name="tabset" id="general" checked />
-            <label for="general">General</label>
-            <!-- Tab 2 -->
-            <input type="radio" name="tabset" id="api" />
-            <label for="api">Api</label>
 
-            <!-- Integrations tab -->
+      <input type="radio" name="tabset" id="general" checked />
-            <input type="radio" name="tabset" id="integrations" />
+      <label for="general">General</label>
-            <label for="integrations">Integrations</label>
 
-            <!-- about tab -->
+      <input type="radio" name="tabset" id="api" />
-            <input type="radio" name="tabset" id="about" />
+      <label for="api">Api</label>
-            <label for="about">About</label>
 
-            <div class="tab-panels">
+      <!-- Integrations tab -->
-                <section id="general" class="tab-panel">
+      <input type="radio" name="tabset" id="integrations" />
-                    <div class="section">
+      <label for="integrations">Integrations</label>
-                        <h3>Playback</h3>
-                        <div class="option">
-                            <h4>Notifications</h4>
-                            <p>
-                                Whether to show a notification when a new song starts.
-                            </p>
-                            <label class="switch">
-                                <input id="notifications" type="checkbox">
-                                <span class="slider round"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="section">
-                        <h3>UI</h3>
-                        <div class="option">
-                            <h4>Menubar</h4>
-                            <p>
-                                Show Tidal-hifi's menu bar
-                            </p>
-                            <label class="switch">
-                                <input id="menuBar" type="checkbox">
-                                <span class="slider round"></span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="section">
-                      <h3>System</h3>
-                      <div class="option">
-                          <h4>Tray icon</h4>
-                          <p>
-                              Show Tidal-hifi's tray icon<br />
-                          </p>
-                          <label class="switch">
-                              <input id="trayIcon" type="checkbox">
-                              <span class="slider round"></span>
-                          </label>
-                      </div>
-                      <div class="option">
-                        <h4>Minimize on Close</h4>
-                        <p>
-                            Minimize window on close instead <br />
-                        </p>
-                        <label class="switch">
-                            <input id="minimizeOnClose" type="checkbox">
-                            <span class="slider round"></span>
-                        </label>
-                      </div>
-                      <div class="option">
-                        <h4>Hotkeys</h4>
-                        <p>
-                            Enables extra hotkeys to achieve feature parity with the <a href = "javascript:openExternal('https://defkey.com/tidal-desktop-shortcuts')">desktop apps</a><br />
-                        </p>
-                        <label class="switch">
-                            <input id="enableCustomHotkeys" type="checkbox">
-                            <span class="slider round"></span>
-                        </label>
-                    </div>
-                  </div>
-                </section>
-                <section id="api" class="tab-panel">
-                    <div class="section">
-                        <h3>Api</h3>
-                        <p style="margin-bottom: 15px;">
-                            Tidal-hifi has a web api built in to allow users to get current song information. You can optionally enable playback control as well.
-                        </p>
 
-                        <div class="option">
+      <!-- advanced tab -->
-                            <h4>Web API</h4>
+      <input type="radio" name="tabset" id="advanced" />
-                            <p>
+      <label for="advanced">Advanced</label>
-                                Whether to enable the Tidal-hifi web api
+      <!-- about tab -->
-                            </p>
+      <input type="radio" name="tabset" id="about" />
-                            <label class="switch">
+      <label for="about">About</label>
-                                <input id="apiCheckbox" type="checkbox">
-                                <span class="slider round"></span>
-                            </label>
-                        </div>
-                        <div class="option">
-                            <h4 style="margin-bottom: 5px;">API port</h4>
-                            <input id="port" type="text" class="freeTextInput" name="port">
-                        </div>
-                        <div class="option">
-                            <h4>Playback control</h4>
-                            <p>
-                                Whether to enable playback control from the api
-                            </p>
-                            <label class="switch">
-                                <input id="playBackControl" type="checkbox">
-                                <span class="slider round"></span>
-                            </label>
-                        </div>
-                    </div>
-                </section>
-                <section id="integrations" class="tab-panel">
-                  <div class="section">
-                      <h3>integrations</h3>
-                      <p style="margin-bottom: 15px;">
-                          Tidal-hifi is extensible trough the use of integrations. You can enable or disable integrations here
-                      </p>
-                      <div class="option">
-                          <h4>mpris-player</h4>
-                          <p>
-                              Whether to enable the mpris media player controls for Linux systems
-                          </p>
-                          <label class="switch">
-                              <input id="mprisCheckbox" type="checkbox">
-                              <span class="slider round"></span>
-                          </label>
-                      </div>
-                      <div class="option">
-                        <h4>Discord RPC</h4>
-                        <p>
-                            Show what you're listening to on Discord
-                        </p>
-                        <label class="switch">
-                            <input id="enableDiscord" type="checkbox">
-                            <span class="slider round"></span>
-                        </label>
-                    </div>
-                  </div>
-              </section>
-                <section id="about" class="tab-panel">
-                  <div class="section">
-                    <img style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
-                    <p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
-                      <a href ="javascript:openExternal('https://github.com/Mastermindzh/tidal-hifi');">Tidal-hifi</a> is made by <a href ="javascript:openExternal('https://www.rickvanlieshout.com')">Rick van Lieshout</a>.<br />
-                      It uses <a href="javascript:openExternal('https://castlabs.com/');">castlabs</a> versions of Electron for widevine support.
-                    </p>
 
-                  </div>
+      <div class="tab-panels">
-                </section>
+        <section id="general" class="tab-panel">
-
+          <div class="section">
-              <small>Some settings require a restart of Tidal-hifi. To do so click the button below:</small>
+            <h3>Playback</h3>
-              <button onClick="restart()" style ="width: 100%">Restart Tidal-hifi</button>
+            <div class="option">
+              <h4>Notifications</h4>
+              <p>
+                Whether to show a notification when a new song starts.
+              </p>
+              <label class="switch">
+                <input id="notifications" type="checkbox">
+                <span class="slider round"></span>
+              </label>
             </div>
-        </div>
+            <div class="option">
+              <h4>Mute Artists automatically</h4>
+              <p>
+                The following list of artists (1 per line) will be muted automatically.
+              </p>
+              <label class="switch" style="margin-bottom:10px">
+                <input id="muteArtists" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+              <textarea id="mutedArtists" cols="40" rows="5"></textarea>
+            </div>
+          </div>
+          <div class="section">
+            <h3>UI</h3>
+            <div class="option">
+              <h4>Menubar</h4>
+              <p>
+                Show Tidal-hifi's menu bar
+              </p>
+              <label class="switch">
+                <input id="menuBar" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+          </div>
+          <div class="section">
+            <h3>System</h3>
+            <div class="option">
+              <h4>Tray icon</h4>
+              <p>
+                Show Tidal-hifi's tray icon<br />
+              </p>
+              <label class="switch">
+                <input id="trayIcon" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4>Minimize on Close</h4>
+              <p>
+                Minimize window on close instead <br />
+              </p>
+              <label class="switch">
+                <input id="minimizeOnClose" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4>Hotkeys</h4>
+              <p>
+                Enables extra hotkeys to achieve feature parity with the <a id="openExternal"
+                  style="text-decoration: underline; cursor: pointer;"
+                  data-url="https://defkey.com/tidal-desktop-shortcuts">desktop apps</a><br />
+              </p>
+              <label class="switch">
+                <input id="enableCustomHotkeys" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4>Single instance</h4>
+              <p>
+                Prevent opening multiple tidal-hifi instances
+              </p>
+              <label class="switch">
+                <input id="singleInstance" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+          </div>
+        </section>
+        <section id="api" class="tab-panel">
+          <div class="section">
+            <h3>Api</h3>
+            <p style="margin-bottom: 15px;">
+              Tidal-hifi has a web api built in to allow users to get current song information. You can optionally
+              enable playback control as well.
+            </p>
+
+            <div class="option">
+              <h4>Web API</h4>
+              <p>
+                Whether to enable the Tidal-hifi web api
+              </p>
+              <label class="switch">
+                <input id="apiCheckbox" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4 style="margin-bottom: 5px;">API port</h4>
+              <input id="port" type="text" class="freeTextInput" name="port">
+            </div>
+            <div class="option">
+              <h4>Playback control</h4>
+              <p>
+                Whether to enable playback control from the api
+              </p>
+              <label class="switch">
+                <input id="playBackControl" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+          </div>
+        </section>
+        <section id="integrations" class="tab-panel">
+          <div class="section">
+            <h3>integrations</h3>
+            <p style="margin-bottom: 15px;">
+              Tidal-hifi is extensible through the use of integrations. You can enable or disable integrations here
+            </p>
+            <div class="option">
+              <h4>MPRIS-player</h4>
+              <p>
+                Whether to enable the MPRIS media player controls for Linux systems
+              </p>
+              <label class="switch">
+                <input id="mprisCheckbox" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4>Discord RPC</h4>
+              <p>
+                Show what you're listening to on Discord
+              </p>
+              <label class="switch">
+                <input id="enableDiscord" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+          </div>
+        </section>
+        <section id="advanced" class="tab-panel">
+          <div class="section">
+            <h3>Flags</h3>
+            <div class="option">
+              <h4>Disable hardware media keys</h4>
+              <p>
+                Disable built-in media keys. <br />
+                Also prevents certain desktop environments from recognizing the chrome MPRIS client separetely from the
+                custom MPRIS client.
+              </p>
+              <label class="switch">
+                <input id="disableHardwareMediaKeys" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+            <div class="option">
+              <h4>Enable GPU rasterization</h4>
+              <p>
+                Move a part of the rendering to the GPU for increased performance.
+              </p>
+              <label class="switch">
+                <input id="gpuRasterization" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </div>
+          </div>
+        </section>
+        <section id="about" class="tab-panel">
+          <div class="section">
+            <img alt="tidal icon"
+              style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;"
+              src="./icon.png">
+            <p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
+              <a id="openExternal" style="text-decoration: underline; cursor: pointer;"
+                data-url="https://github.com/Mastermindzh/tidal-hifi">Tidal-hifi</a> is made by <a id="openExternal"
+                data-url="https://www.rickvanlieshout.com" style="text-decoration: underline; cursor: pointer;">Rick van
+                Lieshout</a>.<br />
+              It uses <a style="text-decoration: underline; cursor: pointer;" id="openExternal"
+                data-url="https://castlabs.com/">Castlabs'</a> versions of Electron for widevine support.
+            </p>
+          </div>
+        </section>
+
+        <small>Some settings require a restart of Tidal-hifi. To do so, click the button below:</small>
+        <button id="restart" style="width: 100%">Restart Tidal-hifi</button>
+      </div>
     </div>
+  </div>
 </body>
 
 <style>
-    .header {
+  .header {
-        -webkit-user-select: none;
+    -webkit-user-select: none;
-        -webkit-app-region: drag;
+    -webkit-app-region: drag;
-    }
+  }
-    .header a {
-      -webkit-app-region: no-drag;
-    }
 
-    * {
+  .header a {
-        margin: 0%;
+    -webkit-app-region: no-drag;
-        padding: 0%;
+  }
-        color: #ffffff;
-        font-weight: 400;
-        font-stretch: normal;
-        -webkit-font-smoothing: antialiased;
-        font-family: nationale, nationale-regular, Helvetica, sans-serif;
-    }
 
-    html,
+  * {
-    body {
+    margin: 0%;
-        height: 100%;
+    padding: 0%;
-        background-color: black;
+    color: #ffffff;
-        display: flex;
+    font-weight: 400;
-        flex-direction: column;
+    font-stretch: normal;
-    }
+    -webkit-font-smoothing: antialiased;
+    font-family: nationale, nationale-regular, Helvetica, sans-serif;
+  }
 
-    h2 {
+  html,
-        font-size: 1.2rem;
+  body {
-    }
+    height: 100%;
+    background-color: black;
+    display: flex;
+    flex-direction: column;
+  }
 
-    small {
+  h2 {
-        font-style: italic;
+    font-size: 1.2rem;
-        color: #72777f;
+  }
-    }
 
-    .header {
+  small {
-        background-color: #242528;
+    font-style: italic;
-        border-bottom: 1px solid #5a5a5a;
+    color: #72777f;
-        height: 50px;
+  }
-    }
 
-    .title {
+  .header {
-        float: left;
+    background-color: #242528;
-        line-height: 50px;
+    border-bottom: 1px solid #5a5a5a;
-        margin-left: 15px;
+    height: 50px;
-    }
+  }
 
-    .accent {
+  .title {
-        color: #0ff;
+    float: left;
-    }
+    line-height: 50px;
+    margin-left: 15px;
+  }
 
-    .exitWindow {
+  .accent {
-        border: none;
+    color: #0ff;
-        outline: none;
+  }
-        text-decoration: none;
-        font-size: 1.4rem;
-        float: right;
-        margin-right: 15px;
-        height: 50px;
-        line-height: 50px;
-    }
 
-    .exitWindow:focus {
+  .exitWindow {
-      border: none;
+    border: none;
-      outline: none;
+    outline: none;
-    }
+    text-decoration: none;
+    font-size: 1.4rem;
+    float: right;
+    margin-right: 15px;
+    height: 50px;
+    line-height: 50px;
+  }
 
-    .exitWindow svg {
+  .exitWindow:focus {
-        height: 50px;
+    border: none;
-        color: white;
+    outline: none;
-    }
+  }
 
-    .section {
+  .exitWindow svg {
-        padding-top: 10px;
+    height: 50px;
-        padding-bottom: 10px;
+    color: white;
-        border-bottom: 1px solid rgba(246, 245, 255, .1);
+  }
-    }
 
-    .section .option {
+  .section {
-        margin-bottom: 15px;
+    padding-top: 10px;
-    }
+    padding-bottom: 10px;
+    border-bottom: 1px solid rgba(246, 245, 255, .1);
+  }
 
-    .section .option p {
+  .section .option {
-        max-width: 75%;
+    margin-bottom: 15px;
-        float: left
+  }
-    }
 
-    .section .option label {
+  .section .option p {
-        float: right;
+    max-width: 75%;
-    }
+    float: left
+  }
 
-    .section:after,
+  .section .option label {
-    .section .option:after {
+    float: right;
-        content: "";
+  }
-        display: table;
-        clear: both;
-    }
 
-    .section h3 {
+  .section:after,
-        margin-bottom: 15px;
+  .section .option:after {
-    }
+    content: "";
+    display: table;
+    clear: both;
+  }
 
-    .section h4 {
+  .section h3 {
-        font-size: 0.9rem;
+    margin-bottom: 15px;
-    }
+  }
 
-    .section p {
+  .section h4 {
-        color: #72777f;
+    font-size: 0.9rem;
-    }
+  }
 
-    .bottom-border {
+  .section p {
-        border-bottom: 1px solid #0ff;
+    color: #72777f;
-    }
+  }
 
-    .body {
+  .bottom-border {
-        padding: 15px;
+    border-bottom: 1px solid #0ff;
-        flex: 1 1 auto;
+  }
-        position: relative;
-        overflow-y: auto;
-    }
 
-    .body::-webkit-scrollbar-track {
+  .body {
-        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    padding: 15px;
-        box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    flex: 1 1 auto;
-        border-radius: 5px;
+    position: relative;
-        background-color: 2a2a2a;
+    overflow-y: auto;
-    }
+  }
 
-    .body::-webkit-scrollbar {
+  .body::-webkit-scrollbar-track {
-        width: 10px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-        background-color: #2a2a2a;
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    }
+    border-radius: 5px;
+    background-color: 2a2a2a;
+  }
 
-    .body::-webkit-scrollbar-thumb {
+  .body::-webkit-scrollbar {
-        border-radius: 10px;
+    width: 10px;
-        -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+    background-color: #2a2a2a;
-        box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  }
-        background-color: #5a5a5a;
-    }
-    /* Tabs */
 
-    .tabset > input[type="radio"] {
+  .body::-webkit-scrollbar-thumb {
-        position: absolute;
+    border-radius: 10px;
-        left: -200vw;
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-    }
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+    background-color: #5a5a5a;
+  }
 
-    .tabset .tab-panel {
+  /* Tabs */
-        display: none;
-    }
 
-    .tabset > input:first-child:checked ~ .tab-panels > .tab-panel:first-child,
+  .tabset>input[type="radio"] {
-    .tabset > input:nth-child(3):checked ~ .tab-panels > .tab-panel:nth-child(2),
+    position: absolute;
-    .tabset > input:nth-child(5):checked ~ .tab-panels > .tab-panel:nth-child(3),
+    left: -200vw;
-    .tabset > input:nth-child(7):checked ~ .tab-panels > .tab-panel:nth-child(4)
+  }
-     {
-        display: block;
-    }
 
-    .tabset > label {
+  .tabset .tab-panel {
-        position: relative;
+    display: none;
-        display: inline-block;
+  }
-        padding: 15px 0px 10px;
-        border-bottom: 0;
-        cursor: pointer;
-    }
 
-    .tabset > input + label {
+  .tabset>input:first-child:checked~.tab-panels>.tab-panel:first-child,
-        color: #e0e0e0;
+  .tabset>input:nth-child(3):checked~.tab-panels>.tab-panel:nth-child(2),
-        margin-right: 30px;
+  .tabset>input:nth-child(5):checked~.tab-panels>.tab-panel:nth-child(3),
-    }
+  .tabset>input:nth-child(7):checked~.tab-panels>.tab-panel:nth-child(4),
+  .tabset>input:nth-child(9):checked~.tab-panels>.tab-panel:nth-child(5) {
+    display: block;
+  }
 
-    .tabset > input:checked + label {
+  .tabset>label {
-        color: #0ff;
+    position: relative;
-        border-bottom: 2px solid #0ff;
+    display: inline-block;
-    }
+    padding: 15px 0px 10px;
+    border-bottom: 0;
+    cursor: pointer;
+  }
 
-    .tab-panel {
+  .tabset>input+label {
-        padding: 10px 0;
+    color: #e0e0e0;
-    }
+    margin-right: 30px;
-    /* switches */
+  }
-    /* The switch - the box around the slider */
 
-    .switch {
+  .tabset>input:checked+label {
-        position: relative;
+    color: #0ff;
-        display: inline-block;
+    border-bottom: 2px solid #0ff;
-        width: 50px;
+  }
-        height: 28px;
-    }
-    /* Hide default HTML checkbox */
 
-    .switch input {
+  .tab-panel {
-        opacity: 0;
+    padding: 10px 0;
-        width: 0;
+  }
-        height: 0;
-    }
-    /* The slider */
 
-    .slider {
+  /* switches */
-        position: absolute;
+  /* The switch - the box around the slider */
-        cursor: pointer;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background-color: rgba(246, 245, 255, .1);
-        -webkit-transition: .4s;
-        transition: .4s;
-    }
 
-    .slider:before {
+  .switch {
-        position: absolute;
+    position: relative;
-        content: "";
+    display: inline-block;
-        height: 24px;
+    width: 50px;
-        width: 24px;
+    height: 28px;
-        left: 2px;
+  }
-        bottom: 2px;
-        background-color: white;
-        -webkit-transition: .4s;
-        transition: .4s;
-    }
 
-    input:checked + .slider {
+  /* Hide default HTML checkbox */
-        background-color: #0ff;
-    }
 
-    input:focus + .slider {
+  .switch input {
-        box-shadow: 0 0 1px #0ff;
+    opacity: 0;
-    }
+    width: 0;
+    height: 0;
+  }
 
-    input:checked + .slider:before {
+  /* The slider */
-        -webkit-transform: translateX(22px);
-        -ms-transform: translateX(22px);
-        transform: translateX(22px);
-    }
-    /* Rounded sliders */
 
-    .slider.round {
+  .slider {
-        border-radius: 34px;
+    position: absolute;
-    }
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(246, 245, 255, .1);
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
 
-    .slider.round:before {
+  .slider:before {
-        border-radius: 50%;
+    position: absolute;
-    }
+    content: "";
-    /* input field */
+    height: 24px;
+    width: 24px;
+    left: 2px;
+    bottom: 2px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
 
-    input {
+  input:checked+.slider {
-        background: transparent;
+    background-color: #0ff;
-        border: 0;
+  }
-        border-bottom: 1px solid rgba(246, 245, 255, .1);
-        color: rgba(229, 238, 255, .6);
-        width: 100%;
-        display: block;
-        padding: 0 0 12px;
-    }
 
-    .freeTextInput:focus {
+  input:focus+.slider {
-        outline: none;
+    box-shadow: 0 0 1px #0ff;
-        border-bottom: 1px solid #0ff;
+  }
-    }
 
-    /* buttons */
+  input:checked+.slider:before {
-    button{
+    -webkit-transform: translateX(22px);
-      border:none;
+    -ms-transform: translateX(22px);
-      background:none;
+    transform: translateX(22px);
-      align-items: center;
+  }
-      background-color: rgba(229,238,255,.2);
+
-      display: inline-flex;
+  /* Rounded sliders */
-      justify-content: center;
+
-      border-radius: 12px;
+  .slider.round {
-      height: 48px;
+    border-radius: 34px;
-      line-height: 49px;
+  }
-      padding: 0 24px;
+
-      text-align: center;
+  .slider.round:before {
-      overflow: hidden;
+    border-radius: 50%;
-      text-overflow: ellipsis;
+  }
-      white-space: nowrap;
+
-      transition: background .35s ease;
+  /* input field */
-      min-height: 0;
+
-      min-width: 0;
+  input {
-      font-size: 1.14286rem;
+    background: transparent;
-      font-family: nationale,nationale-regular,Helvetica,sans-serif;
+    border: 0;
-      margin-top: 10px;
+    border-bottom: 1px solid rgba(246, 245, 255, .1);
-      cursor: pointer;
+    color: rgba(229, 238, 255, .6);
-    }
+    width: 100%;
-    button:hover{
+    display: block;
-      background-color: rgba(229,238,255,.3);
+    padding: 0 0 12px;
-    }
+  }
+
+  .freeTextInput:focus {
+    outline: none;
+    border-bottom: 1px solid #0ff;
+  }
+
+  /* buttons */
+  button {
+    border: none;
+    background: none;
+    align-items: center;
+    background-color: rgba(229, 238, 255, .2);
+    display: inline-flex;
+    justify-content: center;
+    border-radius: 12px;
+    height: 48px;
+    line-height: 49px;
+    padding: 0 24px;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    transition: background .35s ease;
+    min-height: 0;
+    min-width: 0;
+    font-size: 1.14286rem;
+    font-family: nationale, nationale-regular, Helvetica, sans-serif;
+    margin-top: 10px;
+    cursor: pointer;
+  }
+
+  button:hover {
+    background-color: rgba(229, 238, 255, .3);
+  }
+
+  textarea {
+    color: #72777f;
+    background: #242528;
+    border: 0;
+    width: 100%;
+    color: rgba(229, 238, 255, .6);
+    padding: 0 0 12px;
+    display: block;
+  }
+
+  textarea:focus {
+    outline: none;
+    border: 0;
+    border-bottom: 1px solid #0ff;
+  }
 </style>
+
 </html>

src/preload.js

@@ -1,21 +1,18 @@
 const { setTitle } = require("./scripts/window-functions");
-const { dialog, process } = require("electron").remote;
+const { dialog, process, Notification } = require("@electron/remote");
 const { store, settings } = require("./scripts/settings");
 const { ipcRenderer } = require("electron");
-const { app } = require("electron").remote;
+const { app } = require("@electron/remote");
 const { downloadFile } = require("./scripts/download");
 const statuses = require("./constants/statuses");
 const hotkeys = require("./scripts/hotkeys");
 const globalEvents = require("./constants/globalEvents");
-const notifier = require("node-notifier");
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
+const appName = "Tidal Hifi";
 let currentSong = "";
 let player;
 let currentPlayStatus = statuses.paused;
-let progressBarTime;
+let isMutedArtist = true;
-let currentTimeChanged = false;
-let currentTime;
-let currentURL = undefined;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -36,10 +33,14 @@ const elements = {
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
-  duration: '*[data-test="duration-time"]',
+  duration: '*[data-test="duration"]',
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
-
+  album_header_title: '.header-details [data-test="title"]',
+  playing_title: 'span[data-test="table-cell-title"].css-geqnfr',
+  album_name_cell: '[data-test="table-cell-album"]',
+  tracklist_row: '[data-test="tracklist-row"]',
+  volume: '*[data-test="volume"]',
   /**
    * Get an element from the dom
    * @param {*} key key in elements object to fetch
@@ -57,7 +58,7 @@ const elements = {
     if (figure) {
       const mediaElement = figure.querySelector(this["image"]);
       if (mediaElement) {
-        return mediaElement.src;
+        return mediaElement.src.replace("80x80", "640x640");
       }
     }
 
@@ -77,6 +78,33 @@ const elements = {
     return "unknown artist(s)";
   },
 
+  getAlbumName: function () {
+    //If listening to an album, get its name from the header title
+    if (window.location.href.includes("/album/")) {
+      const albumName = window.document.querySelector(this.album_header_title);
+      if (albumName) {
+        return albumName.textContent;
+      }
+      //If listening to a playlist or a mix, get album name from the list
+    } else if (
+      window.location.href.includes("/playlist/") ||
+      window.location.href.includes("/mix/")
+    ) {
+      if (currentPlayStatus === statuses.playing) {
+        const row = window.document.querySelector(this.playing_title).closest(this.tracklist_row);
+        if (row) {
+          return row.querySelector(this.album_name_cell).textContent;
+        }
+      }
+    }
+
+    return "";
+  },
+
+  isMuted: function () {
+    return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
+  },
+
   /**
    * Shorthand function to get the text of a dom element
    * @param {*} key key in elements object to fetch
@@ -157,6 +185,9 @@ function addHotKeys() {
   hotkeys.add("control+=", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
+  hotkeys.add("control+0", function () {
+    ipcRenderer.send(globalEvents.showSettings);
+  });
 }
 
 /**
@@ -190,13 +221,19 @@ function handleLogout() {
   );
 }
 
+function addFullScreenListeners() {
+  window.document.addEventListener("fullscreenchange", () => {
+    ipcRenderer.send(globalEvents.refreshMenuBar);
+  });
+}
+
 /**
  * Add ipc event listeners.
  * Some actions triggered outside of the site need info from the site.
  */
 function addIPCEventListeners() {
   window.addEventListener("DOMContentLoaded", () => {
-    ipcRenderer.on("globalEvent", (event, args) => {
+    ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
           playPause();
@@ -251,13 +288,16 @@ function convertDuration(duration) {
 function updateMediaInfo(options, notify) {
   if (options) {
     ipcRenderer.send(globalEvents.updateInfo, options);
-    store.get(settings.notifications) && notify && notifier.notify(options);
+    if (store.get(settings.notifications) && notify) {
+      new Notification({ title: options.title, body: options.message, icon: options.icon }).show();
+    }
     if (player) {
       player.metadata = {
         ...player.metadata,
         ...{
           "xesam:title": options.title,
           "xesam:artist": [options.message],
+          "xesam:album": options.album,
           "mpris:artUrl": options.image,
           "mpris:length": convertDuration(options.duration) * 1000 * 1000,
         },
@@ -269,19 +309,16 @@ function updateMediaInfo(options, notify) {
 
 /**
  * Checks if Tidal is playing a video or song by grabbing the "a" element from the title.
- * If it's a song it sets the track URL as currentURL, If it's a video it will set currentURL to undefined.
+ * If it's a song it returns the track URL, if not it will return undefined
  */
-function updateURL() {
+function getTrackURL() {
   const URLelement = elements.get("title").querySelector("a");
-  switch (URLelement) {
+  if (URLelement !== null) {
-    case null:
+    const id = URLelement.href.replace(/[^0-9]/g, "");
-      currentURL = undefined;
+    return `https://tidal.com/browse/track/${id}`;
-      break;
-    default:
-      const id = URLelement.href.replace(/[^0-9]/g, "");
-      currentURL = `https://tidal.com/browse/track/${id}`;
-      break;
   }
+
+  return window.location;
 }
 
 /**
@@ -290,79 +327,79 @@ function updateURL() {
 setInterval(function () {
   const title = elements.getText("title");
   const artists = elements.getArtists();
+  muteArtistIfFoundInMutedArtistsList(); // doing this here so that nothing can possibly fail before we call this function
+  
+  const album = elements.getAlbumName();
   const current = elements.getText("current");
   const duration = elements.getText("duration");
-  const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
   const songDashArtistTitle = `${title} - ${artists}`;
   const currentStatus = getCurrentlyPlayingStatus();
   const options = {
     title,
     message: artists,
+    album: album,
     status: currentStatus,
-    url: currentURL,
+    url: getTrackURL(),
-    current: current,
+    current,
-    duration: duration,
+    duration,
+    "app-name": appName,
   };
+  
+
 
-  const playStatusChanged = currentStatus !== currentPlayStatus;
-  const progressBarTimeChanged = progressBarcurrentTime !== progressBarTime;
   const titleOrArtistChanged = currentSong !== songDashArtistTitle;
 
-  if (titleOrArtistChanged || playStatusChanged || progressBarTimeChanged || currentTimeChanged) {
-    // update title, url and play info with new info
-    setTitle(songDashArtistTitle);
-    updateURL();
-    currentSong = songDashArtistTitle;
-    currentPlayStatus = currentStatus;
 
-    // check progress bar value and make sure current stays up to date after switch
+  // update title, url and play info with new info
-    if (progressBarTime != progressBarcurrentTime && !titleOrArtistChanged) {
+  setTitle(songDashArtistTitle);
-      progressBarTime = progressBarcurrentTime;
+  getTrackURL();
-      currentTime = options.current;
+  currentSong = songDashArtistTitle;
-      options.duration = duration;
+  currentPlayStatus = currentStatus;
-      currentTimeChanged = true;
+
+  const image = elements.getSongIcon();
+
+  new Promise((resolve) => {
+    if (image.startsWith("http")) {
+      options.image = image;
+      downloadFile(image, notificationPath).then(
+        () => {
+          options.icon = notificationPath;
+          resolve();
+        },
+        () => {
+          // if the image can't be downloaded then continue without it
+          resolve();
+        }
+      );
+    } else {
+      // if the image can't be found on the page continue without it
+      resolve();
     }
+  }).then(
+    () => {
+      updateMediaInfo(options, titleOrArtistChanged);
+    },
+    () => {}
+  );
 
-    if (currentTimeChanged) {
+  /**
-      if (options.current == currentTime && currentStatus != "paused") return;
+   * Checks whether the current artist is included in the "muted artists" list and if so it will automatically mute the player
-      currentTime = options.current;
+   */
-      currentTimeChanged = false;
+  function muteArtistIfFoundInMutedArtistsList() {
-    }
+    if (store.get(settings.muteArtists)) {
-
+      const mutedArtists = store.get(settings.mutedArtists);
-    // make sure current is set to 0 if title changes
+      if (mutedArtists.find((artist) => artist === artists) !== undefined) {
-    if (titleOrArtistChanged) {
+        if (!elements.isMuted()) {
-      options.current = "0:00";
+          isMutedArtist = true;
-      currentTime = options.current;
+          elements.click("volume");
-      progressBarTime = progressBarcurrentTime;
+        }
-    }
+      } else if (isMutedArtist && elements.isMuted()) {
-
+        elements.click("volume");
-    const image = elements.getSongIcon();
+        isMutedArtist = false;
-
-    new Promise((resolve) => {
-      if (image.startsWith("http")) {
-        options.image = image;
-        downloadFile(image, notificationPath).then(
-          () => {
-            options.icon = notificationPath;
-            resolve();
-          },
-          () => {
-            // if the image can't be downloaded then continue without it
-            resolve();
-          }
-        );
-      } else {
-        // if the image can't be found on the page continue without it
-        resolve();
       }
-    }).then(
+    }
-      () => {
-        updateMediaInfo(options, titleOrArtistChanged);
-      },
-      () => {}
-    );
   }
-}, 200);
+}, 1000);
 
 if (process.platform === "linux" && store.get(settings.mpris)) {
   try {
@@ -422,3 +459,4 @@ if (process.platform === "linux" && store.get(settings.mpris)) {
 
 addHotKeys();
 addIPCEventListeners();
+addFullScreenListeners();

src/scripts/discord.js

@@ -31,6 +31,10 @@ const observer = (event, arg) => {
             : "unknown artist(s)",
           startTimestamp: parseInt(now),
           endTimestamp: parseInt(remaining),
+          largeImageKey: mediaInfoModule.mediaInfo.image,
+          largeImageText: mediaInfoModule.mediaInfo.album
+            ? mediaInfoModule.mediaInfo.album
+            : `${idleStatus.largeImageText}`,
           buttons: [{ label: "Play on Tidal", url: mediaInfoModule.mediaInfo.url }],
         },
       });
@@ -60,24 +64,32 @@ const idleStatus = {
  */
 discordModule.initRPC = function () {
   rpc = new discordrpc.Client({ transport: "ipc" });
-  rpc.login({ clientId }).catch(console.error);
+  rpc.login({ clientId }).then(
-  discordModule.rpc = rpc;
+    () => {
+      discordModule.rpc = rpc;
 
-  rpc.on("ready", () => {
+      rpc.on("ready", () => {
-    rpc.setActivity(idleStatus);
+        rpc.setActivity(idleStatus);
-  });
+      });
-  ipcMain.on(globalEvents.updateInfo, observer);
+      ipcMain.on(globalEvents.updateInfo, observer);
+    },
+    () => {
+      console.error("Can't connect to Discord, is it running?");
+    }
+  );
 };
 
 /**
  * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
  */
 discordModule.unRPC = function () {
-  rpc.clearActivity();
+  if (rpc) {
-  rpc.destroy();
+    rpc.clearActivity();
-  rpc = false;
+    rpc.destroy();
-  discordModule.rpc = rpc;
+    rpc = false;
-  ipcMain.removeListener(globalEvents.updateInfo, observer);
+    discordModule.rpc = undefined;
+    ipcMain.removeListener(globalEvents.updateInfo, observer);
+  }
 };
 
 module.exports = discordModule;

src/scripts/mediaInfo.js

@@ -3,11 +3,13 @@ const statuses = require("./../constants/statuses");
 const mediaInfo = {
   title: "",
   artist: "",
+  album: "",
   icon: "",
   status: statuses.paused,
   url: "",
   current: "",
-  duration: ""
+  duration: "",
+  image: "tidal-hifi-icon"
 };
 const mediaInfoModule = {
   mediaInfo,
@@ -19,11 +21,13 @@ const mediaInfoModule = {
 mediaInfoModule.update = function (arg) {
   mediaInfo.title = propOrDefault(arg.title);
   mediaInfo.artist = propOrDefault(arg.message);
+  mediaInfo.album = propOrDefault(arg.album);
   mediaInfo.icon = propOrDefault(arg.icon);
   mediaInfo.url = propOrDefault(arg.url);
   mediaInfo.status = propOrDefault(arg.status);
   mediaInfo.current = propOrDefault(arg.current);
   mediaInfo.duration = propOrDefault(arg.duration);
+  mediaInfo.image = propOrDefault(arg.image);
 };
 
 /**

src/scripts/menu.js

@@ -1,6 +1,7 @@
-const { Menu } = require("electron");
+const { Menu, app } = require("electron");
 const { showSettingsWindow } = require("./settings");
 const isMac = process.platform === "darwin";
+const { name } = require("./../constants/values");
 
 const settingsMenuEntry = {
   label: "Settings",
@@ -10,98 +11,112 @@ const settingsMenuEntry = {
   accelerator: "Control+/",
 };
 
-const mainMenu = [
+const quitMenuEntry = {
-  ...(isMac
+  label: "Quit",
-    ? [
+  click() {
-        {
+    app.exit(0);
-          label: app.name,
-          submenu: [
-            { role: "about" },
-            settingsMenuEntry,
-            { type: "separator" },
-            { role: "services" },
-            { type: "separator" },
-            { role: "hide" },
-            { role: "hideothers" },
-            { role: "unhide" },
-            { type: "separator" },
-            { role: "quit" },
-          ],
-        },
-      ]
-    : []),
-  // { role: 'fileMenu' }
-  {
-    label: "File",
-    submenu: [settingsMenuEntry, isMac ? { role: "close" } : { role: "quit" }],
   },
-  // { role: 'editMenu' }
+  accelerator: "Control+Q",
-  {
+};
-    label: "Edit",
+
-    submenu: [
+const menuModule = {};
-      { role: "undo" },
+
-      { role: "redo" },
+menuModule.getMenu = function (mainWindow) {
-      { type: "separator" },
+  const toggleWindow = {
-      { role: "cut" },
+    label: "Toggle Window",
-      { role: "copy" },
+    click: function () {
-      { role: "paste" },
+      mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
-      ...(isMac
-        ? [
-            { role: "pasteAndMatchStyle" },
-            { role: "delete" },
-            { role: "selectAll" },
-            { type: "separator" },
-            {
-              label: "Speech",
-              submenu: [{ role: "startspeaking" }, { role: "stopspeaking" }],
-            },
-          ]
-        : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
-      { type: "separator" },
-      settingsMenuEntry,
-    ],
-  },
-  // { role: 'viewMenu' }
-  {
-    label: "View",
-    submenu: [
-      { role: "reload" },
-      { role: "forcereload" },
-      { type: "separator" },
-      { role: "resetzoom" },
-      { role: "zoomin" },
-      { role: "zoomout" },
-      { type: "separator" },
-      { role: "togglefullscreen" },
-    ],
-  },
-  // { role: 'windowMenu' }
-  {
-    label: "Window",
-    submenu: [
-      { role: "minimize" },
-      ...(isMac
-        ? [{ type: "separator" }, { role: "front" }, { type: "separator" }, { role: "window" }]
-        : [{ role: "close" }]),
-    ],
-  },
-  settingsMenuEntry,
-  {
-    label: "About",
-    click() {
-      showSettingsWindow("about");
     },
-  },
+  };
-];
 
-const menuModule = { mainMenu };
+  const mainMenu = [
+    ...(isMac
+      ? [
+          {
+            label: name,
+            submenu: [
+              { role: "about" },
+              settingsMenuEntry,
+              { type: "separator" },
+              { role: "services" },
+              { type: "separator" },
+              { role: "hide" },
+              { role: "hideothers" },
+              { role: "unhide" },
+              { type: "separator" },
+              quitMenuEntry,
+            ],
+          },
+        ]
+      : []),
+    {
+      label: "File",
+      submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
+    },
+    {
+      label: "Edit",
+      submenu: [
+        { role: "undo" },
+        { role: "redo" },
+        { type: "separator" },
+        { role: "cut" },
+        { role: "copy" },
+        { role: "paste" },
+        ...(isMac
+          ? [
+              { role: "pasteAndMatchStyle" },
+              { role: "delete" },
+              { role: "selectAll" },
+              { type: "separator" },
+              {
+                label: "Speech",
+                submenu: [{ role: "startspeaking" }, { role: "stopspeaking" }],
+              },
+            ]
+          : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
+        { type: "separator" },
+        settingsMenuEntry,
+      ],
+    },
+    {
+      label: "View",
+      submenu: [
+        { role: "reload" },
+        { role: "forcereload" },
+        { type: "separator" },
+        { role: "resetzoom" },
+        { role: "zoomin" },
+        { role: "zoomout" },
+        { type: "separator" },
+        { role: "togglefullscreen" },
+        { role: "toggledevtools" },
+      ],
+    },
+    {
+      label: "Window",
+      submenu: [
+        { role: "minimize" },
+        toggleWindow,
+        ...(isMac
+          ? [{ type: "separator" }, { role: "front" }, { type: "separator" }, { role: "window" }]
+          : [{ role: "close" }]),
+      ],
+    },
+    settingsMenuEntry,
+    {
+      label: "About",
+      click() {
+        showSettingsWindow("about");
+      },
+    },
+    toggleWindow,
+  ];
 
-menuModule.getMenu = function () {
   return Menu.buildFromTemplate(mainMenu);
 };
 
-menuModule.addMenu = function () {
+menuModule.addMenu = function (mainWindow) {
-  Menu.setApplicationMenu(menuModule.getMenu());
+  Menu.setApplicationMenu(menuModule.getMenu(mainWindow));
 };
 
 module.exports = menuModule;

src/scripts/settings.js

@@ -10,16 +10,33 @@ const store = new Store({
     notifications: true,
     api: true,
     playBackControl: true,
+    muteArtists: false,
+    mutedArtists: ["TIDAL"],
     menuBar: true,
     apiSettings: {
       port: 47836,
     },
+    singleInstance: true,
+    disableHardwareMediaKeys: false,
     trayIcon: true,
-    minimizeOnClose : false,
+    minimizeOnClose: false,
     mpris: false,
     enableCustomHotkeys: false,
     enableDiscord: false,
     windowBounds: { width: 800, height: 600 },
+    flags: {
+      gpuRasterization: true,
+      disableHardwareMediaKeys: false,
+    },
+  },
+  migrations: {
+    "3.1.0": (migrationStore) => {
+      console.log("running migrations for 3.1.0");
+      migrationStore.set(
+        settings.flags.disableHardwareMediaKeys,
+        migrationStore.get("disableHardwareMediaKeys") ?? false
+      );
+    },
   },
 });
 
@@ -37,7 +54,6 @@ settingsModule.createSettingsWindow = function () {
     frame: false,
     title: "Tidal-hifi - settings",
     webPreferences: {
-      affinity: "window",
       preload: path.join(__dirname, "../pages/settings/preload.js"),
       plugins: true,
       nodeIntegration: true,

src/scripts/tray.js

@@ -1,48 +1,21 @@
-const { Tray, app } = require("electron");
+const { Tray } = require("electron");
-const { Menu } = require("electron");
+const { getMenu } = require("./menu");
-const { getMenu, mainMenu } = require("./menu");
-const { store, settings } = require("./settings");
 const trayModule = {};
 let tray;
 
-trayModule.addTray = function (options = { icon: "" }) {
+trayModule.addTray = function (mainWindow, options = { icon: "" }) {
   tray = new Tray(options.icon);
+  tray.setIgnoreDoubleClickEvents(true);
+  tray.setToolTip("Tidal-hifi");
+
+  const menu = getMenu(mainWindow);
+
+  tray.setContextMenu(menu);
 };
 
 trayModule.refreshTray = function (mainWindow) {
   if (!tray) {
-    trayModule.addTray();
+    trayModule.addTray(mainWindow);
-  }
-
-  tray.on("click", function (e) {
-    if (mainWindow) {
-      mainWindow.show();
-    }
-  });
-
-  tray.setToolTip("Tidal-hifi");
-
-  if (mainWindow && store.get(settings.minimizeOnClose)) {
-    tray.setContextMenu(
-      Menu.buildFromTemplate([
-        {
-          label: "Toggle Window",
-          click: function () {
-            mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
-          },
-        },
-        {
-          label: "Quit",
-          click: function () {
-            mainWindow.destroy();
-            app.quit();
-          },
-        },
-        ...mainMenu, //we add menu items from the other context
-      ])
-    );
-  } else {
-    tray.setContextMenu(getMenu());
   }
 };