Merge branch 'master' of github.com:Mastermindzh/tidal-hifi into pr-dest

- Name has changed to Tidal-Hifi

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -36,6 +36,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build

.nvmrc

@@ -1 +0,0 @@
-19.8.1

CHANGELOG.md

@@ -4,38 +4,13 @@ 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.0.0
-
-- Replaced "muting artists" with a full implementation of an Adblock mechanism
-  > Disabled audio & visual ads, unlocked lyrics, suggested track, track info, unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
-
-- @thanasistrisp updated Electron to 24.1.2 and fixed the tray bug :)
-
-## 4.4.0
-
-- Updated shortcut hint on the menubar to reflect the new `ctrl+=` shortcut.
-- Reverted icon path to `icon.png` instead of the hardcoded linux path.
-- Add support to autoHide the menubar and showing it with the `alt` key.
-- Move the quit command from the system sub-menu to the main menu
-- Added single click focus/show on the tray icon
-  - Doesn't work on all platforms. Nothing I can do about that unfortunately!
-- Added a list of artists to automatically skip.
-  - I don't like the vast majority of dutch music so I added one of them to my list to test: [./docs/no-dutch-music.mp4](./docs/no-dutch-music.mp4)
-
-## 4.3.1
-
-- fix: App always requests a default-url-handler-scheme change on start
-
-## 4.3.0
-
-- Added a setting to disable background throttling ([docs](https://www.electronjs.org/docs/latest/api/browser-window))
-
 ## 4.2.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
+  -
 
 ## 4.1.2
 

README.md

@@ -1,43 +1,39 @@
-# Tidal-hifi<img src = "./build/icon.png" height="40" align="right"/>
+<h1>
-
+Tidal-hifi
-![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg)
+<img src = "./build/icon.png" height="40" align="right" />
+</h1>
 
 The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi support thanks to widevine.
 
 ![tidal-hifi preview](./docs/preview.png)
 
-## Table of Contents
+## Table of contents
 
 <!-- toc -->
 
 - [Installation](#installation)
-  - [Dependencies](#dependencies)
+  * [Using releases](#using-releases)
-  - [Using releases](#using-releases)
+  * [Snap](#snap)
-  - [Snap](#snap)
+  * [Arch Linux](#arch-linux)
-  - [Arch Linux](#arch-linux)
+  * [Flatpak](#flatpak)
-  - [Flatpak](#flatpak)
+  * [Nix](#nix)
-  - [Nix](#nix)
+  * [Using source](#using-source)
-  - [Using source](#using-source)
 - [Features](#features)
 - [Integrations](#integrations)
-  - [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)
+- [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 -->
 
 ## Installation
 
-### Dependencies
-
-Note that you **need** a notification library such as [libnotify](https://github.com/GNOME/libnotify) or [dunst](https://github.com/dunst-project/dunst) in order for the software to work properly.
-
 ### Using releases
 
 Various packaged versions of the software are available on the [releases](https://github.com/Mastermindzh/tidal-hifi/releases) tab.
@@ -97,7 +93,7 @@ To install and work with the code on this project follow these steps:
 - Notifications
 - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
 - 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))
+- [Mute artists automatically (defaults to "Tidal")]("./docs/muting-artists.md")
 - Custom [integrations](#integrations)
 - [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))
@@ -143,7 +139,7 @@ Whilst there are a handful of projects attempting to run Tidal on Electron they
 
 Sometimes it's just easier to start over, cover my own needs and then making it available to the public :)
 
-## Special thanks to
+## Special thanks to...
 
 - [Castlabs](https://castlabs.com/)
   For maintaining Electron with Widevine CDM installation, Verified Media Path (VMP), and persistent licenses (StorageID)

build/electron-builder.base.yml

@@ -1,7 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 24.1.2
+electronVersion: 19.0.5
 electronDownload:
-  version: 24.1.2+wvcus
+  version: 19.0.5+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
@@ -18,7 +18,7 @@ linux:
     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
+    Icon: /usr/share/icons/hicolor/0x0/apps/tidal-hifi.png
     StartupNotify: true
     Terminal: false
     Type: Application

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,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.0.0",
+  "version": "4.2.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "src/main.js",
   "scripts": {
@@ -31,22 +31,21 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.0.9",
+    "@electron/remote": "^2.0.8",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.1.0",
-    "express": "^4.18.2",
+    "express": "^4.18.1",
-    "hotkeys-js": "^3.10.2",
+    "hotkeys-js": "^3.9.4",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.62.0"
+    "sass": "^1.54.9"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "electron": "git+https://github.com/castlabs/electron-releases.git#v24.1.2+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v19.0.5+wvcus",
-    "electron-builder": "^24.2.1",
+    "electron-builder": "^23.3.3",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^3.14.1",
-    "markdown-toc": "^1.2.0",
+    "prettier": "^2.7.1",
-    "prettier": "^2.8.7",
     "sass-lint": "^1.13.1",
     "sass-lint-auto-fix": "^0.21.2"
   },

src/constants/settings.js

@@ -13,10 +13,8 @@ const settings = {
   api: "api",
   menuBar: "menuBar",
   playBackControl: "playBackControl",
-  skipArtists: "skipArtists",
+  muteArtists: "muteArtists",
-  skippedArtists: "skippedArtists",
+  mutedArtists: "mutedArtists",
-  adBlock: "adBlock",
-  disableBackgroundThrottle: "disableBackgroundThrottle",
   apiSettings: {
     root: "apiSettings",
     port: "apiSettings.port",

src/main.js

@@ -1,13 +1,5 @@
 require("@electron/remote/main").initialize();
-const {
+const { app, BrowserWindow, components, globalShortcut, ipcMain, protocol } = require("electron");
-  app,
-  BrowserWindow,
-  components,
-  globalShortcut,
-  ipcMain,
-  protocol,
-  session,
-} = require("electron");
 const {
   settings,
   store,
@@ -57,10 +49,7 @@ function setFlags() {
  *
  */
 function syncMenuBarWithStore() {
-  const fixedMenuBar = store.get(settings.menuBar);
+  mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
-
-  mainWindow.autoHideMenuBar = !fixedMenuBar;
-  mainWindow.setMenuBarVisibility(fixedMenuBar);
 }
 
 /**
@@ -89,9 +78,7 @@ function createWindow(options = {}) {
     height: store && store.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
@@ -104,11 +91,6 @@ function createWindow(options = {}) {
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
 
-  if (store.get(settings.disableBackgroundThrottle)) {
-    // prevent setInterval lag
-    mainWindow.webContents.setBackgroundThrottling(false);
-  }
-
   // run stuff after first load
   mainWindow.webContents.once("did-finish-load", () => {});
 
@@ -136,9 +118,7 @@ function registerHttpProtocols() {
   protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request, _callback) => {
     mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
   });
-  if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
   app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
-  }
 }
 
 function addGlobalShortcuts() {
@@ -155,16 +135,6 @@ function addGlobalShortcuts() {
 app.on("ready", async () => {
   if (isMainInstanceOrMultipleInstancesAllowed()) {
     await components.whenReady();
-
-    // Adblock
-    if (store.get(settings.adBlock)) {
-      const filter = { urls: ["https://listen.tidal.com/*"] };
-      session.defaultSession.webRequest.onBeforeRequest(filter, (details, callback) => {
-        if (details.url.match(/\/users\/.*\d\?country/)) callback({ cancel: true });
-        else callback({ cancel: false });
-      });
-    }
-
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();

src/pages/settings/preload.js

@@ -3,15 +3,13 @@ let trayIcon,
   mpris,
   enableCustomHotkeys,
   enableDiscord,
-  skipArtists,
+  muteArtists,
   notifications,
   playBackControl,
   api,
   port,
   menuBar,
-  skippedArtists,
+  mutedArtists,
-  adBlock,
-  disableBackgroundThrottle,
   singleInstance,
   disableHardwareMediaKeys,
   gpuRasterization;
@@ -35,13 +33,11 @@ function refreshSettings() {
   enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
   enableDiscord.checked = store.get(settings.enableDiscord);
   minimizeOnClose.checked = store.get(settings.minimizeOnClose);
-  skipArtists.checked = store.get(settings.skipArtists);
+  muteArtists.checked = store.get(settings.muteArtists);
-  skippedArtists.value = store.get(settings.skippedArtists).join("\n");
+  mutedArtists.value = store.get(settings.mutedArtists).join("\n");
-  adBlock.checked = store.get(settings.adBlock);
   singleInstance.checked = store.get(settings.singleInstance);
   disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
   gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
-  disableBackgroundThrottle.checked = store.get("disableBackgroundThrottle");
 }
 
 /**
@@ -64,7 +60,7 @@ function hide() {
  */
 function restart() {
   app.relaunch();
-  app.exit();
+  app.quit();
 }
 
 /**
@@ -119,10 +115,8 @@ window.addEventListener("DOMContentLoaded", () => {
   mpris = get("mprisCheckbox");
   enableCustomHotkeys = get("enableCustomHotkeys");
   enableDiscord = get("enableDiscord");
-  skipArtists = get("skipArtists");
+  muteArtists = get("muteArtists");
-  skippedArtists = get("skippedArtists");
+  mutedArtists = get("mutedArtists");
-  adBlock = get("adBlock");
-  disableBackgroundThrottle = get("disableBackgroundThrottle");
   singleInstance = get("singleInstance");
   disableHardwareMediaKeys = get("disableHardwareMediaKeys");
   gpuRasterization = get("gpuRasterization");
@@ -139,10 +133,8 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
   addInputListener(enableDiscord, settings.enableDiscord);
   addInputListener(minimizeOnClose, settings.minimizeOnClose);
-  addInputListener(skipArtists, settings.skipArtists);
+  addInputListener(muteArtists, settings.muteArtists);
-  addTextAreaListener(skippedArtists, settings.skippedArtists);
+  addTextAreaListener(mutedArtists, settings.mutedArtists);
-  addInputListener(adBlock, settings.adBlock);
-  addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
   addInputListener(singleInstance, settings.singleInstance);
   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
   addInputListener(gpuRasterization, settings.flags.gpuRasterization);

src/pages/settings/settings.html

@@ -48,44 +48,31 @@
                 <p>Show a notification when a new song starts.</p>
               </div>
               <label class="switch">
-                <input id="notifications" type="checkbox" />
+                <input id="notifications" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
             <div class="group__option">
               <div class="group__description">
-                <h4>Skip Artists automatically</h4>
+                <h4>Mute Artists automatically</h4>
-                <p>The following list of artists (1 per line) will be skipped automatically.</p>
+                <p>The following list of artists (1 per line) will be muted automatically.</p>
               </div>
               <label class="switch">
-                <input id="skipArtists" type="checkbox" />
+                <input id="muteArtists" type="checkbox">
-                <span class="switch__slider"></span>
-              </label>
-            </div>
-            <textarea id="skippedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Block ads</h4>
-                <p>
-                  Disabled audio & visual ads, unlocked lyrics, suggested track, track info,
-                  unlimited skips
-                </p>
-              </div>
-              <label class="switch">
-                <input id="adBlock" type="checkbox" />
                 <span class="switch__slider"></span>
               </label>
             </div>
+            <textarea id="mutedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
           </div>
           <div class="group">
             <p class="group__title">UI</p>
             <div class="group__option">
               <div class="group__description">
-                <h4>Fixed menubar</h4>
+                <h4>Menubar</h4>
-                <p>Always show TIDAL Hi-Fi's menu bar.</p>
+                <p>Show TIDAL Hi-Fi's menu bar.</p>
               </div>
               <label class="switch">
-                <input id="menuBar" type="checkbox" />
+                <input id="menuBar" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -98,7 +85,7 @@
                 <p>Show TIDAL Hi-Fi's tray icon.</p>
               </div>
               <label class="switch">
-                <input id="trayIcon" type="checkbox" />
+                <input id="trayIcon" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -108,7 +95,7 @@
                 <p>Minimize window on close instead.</p>
               </div>
               <label class="switch">
-                <input id="minimizeOnClose" type="checkbox" />
+                <input id="minimizeOnClose" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -121,7 +108,7 @@
                 </p>
               </div>
               <label class="switch">
-                <input id="enableCustomHotkeys" type="checkbox" />
+                <input id="enableCustomHotkeys" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -131,7 +118,7 @@
                 <p>Prevent opening multiple TIDAL Hi-Fi's instances.</p>
               </div>
               <label class="switch">
-                <input id="singleInstance" type="checkbox" />
+                <input id="singleInstance" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -143,8 +130,8 @@
             <p class="group__title">API</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi has a built-in web API to allow users to get current song information.
+                TIDAL Hi-Fi has a built-in web API to allow users to get current song information. You can optionally
-                You can optionally enable playback control as well.
+                enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -153,14 +140,14 @@
                 <p>Enable the TIDAL Hi-Fi web API.</p>
               </div>
               <label class="switch">
-                <input id="apiCheckbox" type="checkbox" />
+                <input id="apiCheckbox" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
             <div class="group__option">
               <div class="group__description">
                 <label for="port">API port</label>
-                <input id="port" type="text" class="text-input" name="port" />
+                <input id="port" type="text" class="text-input" name="port">
               </div>
             </div>
             <div class="group__option">
@@ -169,7 +156,7 @@
                 <p>Enable playback control from the web API.</p>
               </div>
               <label class="switch">
-                <input id="playBackControl" type="checkbox" />
+                <input id="playBackControl" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -181,20 +168,18 @@
             <p class="group__title">Integrations</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi is extensible through the use of integrations. You can enable or
+                TIDAL Hi-Fi is extensible through the use of integrations.
-                disable them here.
+                You can enable or disable them here.
               </p>
             </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>MPRIS</h4>
-                <p>
+                <p>Enable MPRIS interface which provides a mechanism for discovery, querying and basic playback control
-                  Enable MPRIS interface which provides a mechanism for discovery, querying and
+                  on Linux systems.</p>
-                  basic playback control on Linux systems.
-                </p>
               </div>
               <label class="switch">
-                <input id="mprisCheckbox" type="checkbox" />
+                <input id="mprisCheckbox" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -204,7 +189,7 @@
                 <p>Show what you're listening to on Discord.</p>
               </div>
               <label class="switch">
-                <input id="enableDiscord" type="checkbox" />
+                <input id="enableDiscord" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -218,12 +203,12 @@
               <div class="group__description">
                 <h4>Disable hardware built-in media keys</h4>
                 <p>
-                  Also prevents certain desktop environments from recognizing the chrome MPRIS
+                  Also prevents certain desktop environments from recognizing the chrome
-                  client separately from the custom MPRIS client.
+                  MPRIS client separately from the custom MPRIS client.
                 </p>
               </div>
               <label class="switch">
-                <input id="disableHardwareMediaKeys" type="checkbox" />
+                <input id="disableHardwareMediaKeys" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -233,19 +218,7 @@
                 <p>Move a part of the rendering to the GPU for increased performance.</p>
               </div>
               <label class="switch">
-                <input id="gpuRasterization" type="checkbox" />
+                <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>
@@ -253,20 +226,17 @@
         </section>
 
         <section id="about-section" class="tabs__section about-section">
-          <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
+          <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
+            is made by <a class="external-link" data-url="https://www.rickvanlieshout.com">
-            <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>
-              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>
         </section>
 
         <footer class="footer">
-          <p class="footer__note">
+          <p class="footer__note">Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
-            Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
           </p>
           <button class="footer__button" id="restart">Restart TIDAL Hi-Fi</button>
         </footer>

src/preload.js

@@ -7,12 +7,12 @@ const { downloadFile } = require("./scripts/download");
 const statuses = require("./constants/statuses");
 const hotkeys = require("./scripts/hotkeys");
 const globalEvents = require("./constants/globalEvents");
-const { skipArtists } = require("./constants/settings");
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 const appName = "Tidal Hifi";
 let currentSong = "";
 let player;
 let currentPlayStatus = statuses.paused;
+let isMutedArtist = true;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -300,7 +300,6 @@ function updateMediaInfo(options, notify) {
           "xesam:album": options.album,
           "mpris:artUrl": options.image,
           "mpris:length": convertDuration(options.duration) * 1000 * 1000,
-          "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
         },
       };
       player.playbackStatus = options.status == statuses.paused ? "Paused" : "Playing";
@@ -313,15 +312,10 @@ function updateMediaInfo(options, notify) {
  * If it's a song it returns the track URL, if not it will return undefined
  */
 function getTrackURL() {
-  const id = getTrackID();
-  return `https://tidal.com/browse/track/${id}`;
-}
-
-function getTrackID() {
   const URLelement = elements.get("title").querySelector("a");
   if (URLelement !== null) {
-    const id = URLelement.href.replace(/\D/g, "");
+    const id = URLelement.href.replace(/[^0-9]/g, "");
-    return id;
+    return `https://tidal.com/browse/track/${id}`;
   }
 
   return window.location;
@@ -333,7 +327,7 @@ function getTrackID() {
 setInterval(function () {
   const title = elements.getText("title");
   const artists = elements.getArtists();
-  skipArtistsIfFoundInSkippedArtistsList(artists);
+  muteArtistIfFoundInMutedArtistsList(); // doing this here so that nothing can possibly fail before we call this function
   
   const album = elements.getAlbumName();
   const current = elements.getText("current");
@@ -351,8 +345,11 @@ setInterval(function () {
     "app-name": appName,
   };
   
+
+
   const titleOrArtistChanged = currentSong !== songDashArtistTitle;
 
+
   // update title, url and play info with new info
   setTitle(songDashArtistTitle);
   getTrackURL();
@@ -386,18 +383,23 @@ setInterval(function () {
   );
 
   /**
-   * automatically skip a song if the artists are found in the list of artists to skip
+   * Checks whether the current artist is included in the "muted artists" list and if so it will automatically mute the player
-   * @param {*} artists list of artists to skip
    */
-  function skipArtistsIfFoundInSkippedArtistsList(artists) {
+  function muteArtistIfFoundInMutedArtistsList() {
-    if (store.get(skipArtists)) {
+    if (store.get(settings.muteArtists)) {
-      const skippedArtists = store.get(settings.skippedArtists);
+      const mutedArtists = store.get(settings.mutedArtists);
-      if (skippedArtists.find((artist) => artist === artists) !== undefined) {
+      if (mutedArtists.find((artist) => artist === artists) !== undefined) {
-        elements.click("next");
+        if (!elements.isMuted()) {
+          isMutedArtist = true;
+          elements.click("volume");
+        }
+      } else if (isMutedArtist && elements.isMuted()) {
+        elements.click("volume");
+        isMutedArtist = false;
       }
     }
   }
-}, 100);
+}, 1000);
 
 if (process.platform === "linux" && store.get(settings.mpris)) {
   try {

src/scripts/menu.js

@@ -8,7 +8,7 @@ const settingsMenuEntry = {
   click() {
     showSettingsWindow();
   },
-  accelerator: "Control+=",
+  accelerator: "Control+/",
 };
 
 const quitMenuEntry = {
@@ -110,7 +110,6 @@ menuModule.getMenu = function (mainWindow) {
       },
     },
     toggleWindow,
-    quitMenuEntry,
   ];
 
   return Menu.buildFromTemplate(mainMenu);

src/scripts/settings.js

@@ -10,10 +10,8 @@ const store = new Store({
     notifications: true,
     api: true,
     playBackControl: true,
-    skipArtists: false,
+    muteArtists: false,
-    skippedArtists: [""],
+    mutedArtists: ["TIDAL"],
-    adBlock: false,
-    disableBackgroundThrottle: true,
     menuBar: true,
     apiSettings: {
       port: 47836,

src/scripts/tray.js

@@ -11,18 +11,6 @@ trayModule.addTray = function (mainWindow, options = { icon: "" }) {
   const menu = getMenu(mainWindow);
 
   tray.setContextMenu(menu);
-
-  tray.on("click", function () {
-    if (mainWindow.isVisible()) {
-      if (!mainWindow.isFocused()) {
-        mainWindow.focus();
-      } else {
-        mainWindow.hide();
-      }
-    } else {
-      mainWindow.show();
-    }
-  });
 };
 
 trayModule.refreshTray = function (mainWindow) {