Merge 403354186e into 15cc6bb6d4

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
 
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
 
@@ -41,6 +41,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 22.4
+          node-version: 19
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

CHANGELOG.md

@@ -4,21 +4,6 @@ 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.16.0]
-
-- Fix issue #449 Discord RPC stuck on "Browsing Tidal".
-- Fix issue #448 Add option to disable the discord rpc idle text
-- Notifications are now send at the end of the update process, allowing other events to happen sooner.
-
-## [5.15.0]
-
-- Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
-- Updated most dependency versions
-  - This includes Electron 31!
-
-- Added a channel selector so we can now use Tidal's staging environment directly from the app
-  - implements [#437](https://github.com/Mastermindzh/tidal-hifi/issues/437)
-
 ## [5.14.1]
 
 - Fixed `getAlbumName` not finding album name whilst on queue page

README.md

@@ -26,7 +26,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
     - [Using source](#using-source)
   - [Integrations](#integrations)
   - [Known bugs](#known-bugs)
-    - [DRM not working on Windows (error S6007)](#drm-not-working-on-windows-error-s6007)
+    - [DRM not working on Windows](#drm-not-working-on-windows)
   - [Special thanks to](#special-thanks-to)
   - [Donations](#donations)
   - [Images](#images)
@@ -153,13 +153,11 @@ Integrations with other projects that are not included natively:
 
 ## Known bugs
 
-### DRM not working on Windows (error S6007)
+### DRM not working on Windows
 
 Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
 Nothing I can do about that I'm afraid... Tidal is working on removing/changing DRM so when they finish with that we can give it another shot.
 
-Until then you'll have to use the official app unfortunately.
-
 ## Special thanks to
 
 - [Castlabs](https://castlabs.com/)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.16.0",
+  "version": "5.14.1",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "hotkeys-js": "^3.13.7",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.77.8",
+    "sass": "^1.77.4",
     "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
@@ -58,27 +58,27 @@
     "@types/cors": "^2.8.17",
     "@types/discord-rpc": "^4.0.8",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.12.12",
     "@types/request": "^2.48.12",
     "@types/swagger-ui-express": "^4.1.6",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@typescript-eslint/parser": "^6.18.0",
     "copyfiles": "^2.4.1",
-    "electron": "git+https://github.com/castlabs/electron-releases#v31.1.0+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases#v28.1.1+wvcus",
-    "electron-builder": "~24.9.4",
+    "electron-builder": "^24.9.1",
-    "eslint": "^8.57.0",
+    "eslint": "^8.56.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "nodemon": "^3.1.4",
+    "nodemon": "^3.0.2",
-    "prettier": "^3.3.2",
+    "prettier": "^3.1.1",
-    "stylelint": "^16.6.1",
+    "stylelint": "^16.1.0",
-    "stylelint-config-standard": "^36.0.1",
+    "stylelint-config-standard": "^36.0.0",
-    "stylelint-config-standard-scss": "^13.1.0",
+    "stylelint-config-standard-scss": "^13.0.0",
     "stylelint-prettier": "^5.0.0",
     "swagger-jsdoc": "^6.2.8",
     "ts-node": "^10.9.2",
-    "tsc-watch": "^6.2.0",
+    "tsc-watch": "^6.0.4",
-    "typescript": "^5.5.3"
+    "typescript": "^5.3.3"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

src/constants/settings.ts

@@ -10,10 +10,6 @@
  */
 export const settings = {
   adBlock: "adBlock",
-  advanced: {
-    root: "advanced",
-    tidalUrl: "advanced.tidalUrl",
-  },
   api: "api",
   apiSettings: {
     root: "apiSettings",
@@ -30,7 +26,6 @@ export const settings = {
     buttonText: "discord.buttonText",
     includeTimestamps: "discord.includeTimestamps",
     showSong: "discord.showSong",
-    showIdle: "discord.showIdle",
     idleText: "discord.idleText",
     usingText: "discord.usingText",
   },

src/features/api/features/player.ts

@@ -29,13 +29,12 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
   if (settingsStore.get(settings.playBackControl)) {
     /**
      * @swagger
-     * /player/play:
+     * /play:
-     *   post:
+     *   get:
-     *     summary: Play the current media
+     *     summary: Play action
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:
@@ -45,13 +44,12 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
 
     /**
      * @swagger
-     * /player/favorite/toggle:
+     * /favorite/toggle:
      *   post:
-     *     summary: Add the current media to your favorites, or remove it if its already added to your favorites
+     *     summary: Toggle favorite
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:
@@ -61,13 +59,12 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
 
     /**
      * @swagger
-     * /player/pause:
+     * /pause:
-     *   post:
+     *   get:
-     *     summary: Pause the current media
+     *     summary: Pause action
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:
@@ -77,13 +74,12 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
 
     /**
      * @swagger
-     * /player/next:
+     * /next:
-     *   post:
+     *   get:
-     *     summary: Play the next song
+     *     summary: Next action
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:
@@ -93,13 +89,12 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
 
     /**
      * @swagger
-     * /player/previous:
+     * /previous:
-     *   post:
+     *   get:
-     *     summary: Play the previous song
+     *     summary: Previous action
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:
@@ -107,47 +102,17 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
      */
     createPlayerAction("/previous", globalEvents.previous);
 
-    /**
-     * @swagger
-     * /player/shuffle/toggle:
-     *   post:
-     *     summary: Play the previous song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle);
-
-    /**
-     * @swagger
-     * /player/repeat/toggle:
-     *   post:
-     *     summary: Toggle the repeat status, toggles between "off" , "single" and "all"
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat);
 
     /**
      * @swagger
-     * /player/playpause:
+     * /playpause:
-     *   post:
+     *   get:
-     *     summary: Start playing the media if paused, or pause the media if playing
+     *     summary: Toggle play/pause
-     *     tags: [player]
      *     responses:
      *       200:
-     *         description: Ok
+     *         description: Action performed
      *         content:
      *           text/plain:
      *             schema:

src/features/api/legacy.ts

@@ -18,7 +18,6 @@ export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
    * /image:
    *   get:
    *     summary: Get current image
-   *     tags: [legacy]
    *     deprecated: true
    *     responses:
    *       200:
@@ -37,108 +36,13 @@ export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
     addLegacyControls();
   }
   function addLegacyControls() {
-    /**
-     * @swagger
-     * /play:
-     *   get:
-     *     summary: Play the current media
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Action performed
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play));
-
-    /**
-     * @swagger
-     * /favorite/toggle:
-     *   get:
-     *     summary: Add the current media to your favorites, or remove it if its already added to your favorites
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.post("/favorite/toggle", (req, res) =>
       handleGlobalEvent(res, globalEvents.toggleFavorite)
     );
-
-    /**
-     * @swagger
-     * /pause:
-     *   get:
-     *     summary: Pause the current media
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
-
-    /**
-     * @swagger
-     * /next:
-     *   get:
-     *     summary: Play the next song
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
-
-    /**
-     * @swagger
-     * /previous:
-     *   get:
-     *     summary: Play the previous song
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
-
-    /**
-     * @swagger
-     * /playpause:
-     *   get:
-     *     summary: Toggle play/pause
-     *     tags: [legacy]
-     *     deprecated: true
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.get("/playpause", (req, res) => {
       if (mediaInfo.status === MediaStatus.playing) {
         handleGlobalEvent(res, globalEvents.pause);

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.16.0",
+    "version": "5.14.1",
     "description": "",
     "license": {
       "name": "MIT",
@@ -62,15 +62,12 @@
         }
       }
     },
-    "/player/play": {
+    "/play": {
-      "post": {
+      "get": {
-        "summary": "Play the current media",
+        "summary": "Play action",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
             "content": {
               "text/plain": {
                 "schema": {
@@ -82,15 +79,12 @@
         }
       }
     },
-    "/player/favorite/toggle": {
+    "/favorite/toggle": {
       "post": {
-        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
+        "summary": "Toggle favorite",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
             "content": {
               "text/plain": {
                 "schema": {
@@ -102,15 +96,12 @@
         }
       }
     },
-    "/player/pause": {
+    "/pause": {
-      "post": {
+      "get": {
-        "summary": "Pause the current media",
+        "summary": "Pause action",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
             "content": {
               "text/plain": {
                 "schema": {
@@ -122,15 +113,12 @@
         }
       }
     },
-    "/player/next": {
+    "/next": {
-      "post": {
+      "get": {
-        "summary": "Play the next song",
+        "summary": "Next action",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
             "content": {
               "text/plain": {
                 "schema": {
@@ -142,15 +130,12 @@
         }
       }
     },
-    "/player/previous": {
+    "/previous": {
-      "post": {
+      "get": {
-        "summary": "Play the previous song",
+        "summary": "Previous action",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
             "content": {
               "text/plain": {
                 "schema": {
@@ -162,55 +147,12 @@
         }
       }
     },
-    "/player/shuffle/toggle": {
+    "/playpause": {
-      "post": {
+      "get": {
-        "summary": "Play the previous song",
+        "summary": "Toggle play/pause",
-        "tags": [
-          "player"
-        ],
         "responses": {
           "200": {
-            "description": "Ok",
+            "description": "Action performed",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/repeat/toggle": {
-      "post": {
-        "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/playpause": {
-      "post": {
-        "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
             "content": {
               "text/plain": {
                 "schema": {
@@ -313,9 +255,6 @@
     "/image": {
       "get": {
         "summary": "Get current image",
-        "tags": [
-          "legacy"
-        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -334,132 +273,6 @@
           }
         }
       }
-    },
-    "/play": {
-      "get": {
-        "summary": "Play the current media",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Action performed",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/favorite/toggle": {
-      "get": {
-        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/pause": {
-      "get": {
-        "summary": "Pause the current media",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/next": {
-      "get": {
-        "summary": "Play the next song",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/previous": {
-      "get": {
-        "summary": "Play the previous song",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/playpause": {
-      "get": {
-        "summary": "Toggle play/pause",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
     }
   },
   "components": {

src/features/listenbrainz/listenbrainz.ts

@@ -48,9 +48,6 @@ export class ListenBrainz {
       } else {
         // Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area
         const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
-        const tidalUrl =
-          settingsStore.get<string, string>(settings.advanced.tidalUrl) ||
-          "https://listen.tidal.com";
         const playing_data = {
           listen_type: "playing_now",
           payload: [
@@ -98,7 +95,7 @@ export class ListenBrainz {
                     additional_info: {
                       media_player: "Tidal Hi-Fi",
                       submission_client: "Tidal Hi-Fi",
-                      music_service: tidalUrl,
+                      music_service: "listen.tidal.com",
                       duration: oldData.duration,
                     },
                     artist_name: oldData.artists,

src/main.ts

@@ -24,6 +24,7 @@ import {
   showSettingsWindow,
 } from "./scripts/settings";
 import { addTray, refreshTray } from "./scripts/tray";
+const tidalUrl = "https://listen.tidal.com";
 let mainInhibitorId = -1;
 
 initialize();
@@ -39,9 +40,6 @@ const windowPreferences = {
 setDefaultFlags(app);
 setManagedFlagsFromSettings(app);
 
-const tidalUrl =
-  settingsStore.get<string, string>(settings.advanced.tidalUrl) || "https://listen.tidal.com";
-
 /**
  * Update the menuBarVisibility according to the store value
  *

src/pages/settings/preload.ts

@@ -29,7 +29,6 @@ const switchesWithSettings = {
 
 let adBlock: HTMLInputElement,
   api: HTMLInputElement,
-  channel: HTMLSelectElement,
   customCSS: HTMLInputElement,
   disableBackgroundThrottle: HTMLInputElement,
   disableHardwareMediaKeys: HTMLInputElement,
@@ -58,7 +57,6 @@ let adBlock: HTMLInputElement,
   discord_include_timestamps: HTMLInputElement,
   discord_button_text: HTMLInputElement,
   discord_show_song: HTMLInputElement,
-  discord_show_idle: HTMLInputElement,
   discord_idle_text: HTMLInputElement,
   discord_using_text: HTMLInputElement;
 
@@ -123,7 +121,6 @@ function refreshSettings() {
   try {
     adBlock.checked = settingsStore.get(settings.adBlock);
     api.checked = settingsStore.get(settings.api);
-    channel.value = settingsStore.get(settings.advanced.tidalUrl);
     customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
     disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
     disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
@@ -152,7 +149,6 @@ function refreshSettings() {
     discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps);
     discord_button_text.value = settingsStore.get(settings.discord.buttonText);
     discord_show_song.checked = settingsStore.get(settings.discord.showSong);
-    discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
     discord_idle_text.value = settingsStore.get(settings.discord.idleText);
     discord_using_text.value = settingsStore.get(settings.discord.usingText);
 
@@ -242,7 +238,6 @@ window.addEventListener("DOMContentLoaded", () => {
 
   adBlock = get("adBlock");
   api = get("apiCheckbox");
-  channel = get<HTMLSelectElement>("channel");
   customCSS = get("customCSS");
   disableBackgroundThrottle = get("disableBackgroundThrottle");
   disableHardwareMediaKeys = get("disableHardwareMediaKeys");
@@ -271,14 +266,12 @@ window.addEventListener("DOMContentLoaded", () => {
   listenbrainz_delay = get("listenbrainz_delay");
   discord_button_text = get("discord_button_text");
   discord_show_song = get("discord_show_song");
-  discord_show_idle = get("discord_show_idle");
   discord_using_text = get("discord_using_text");
   discord_idle_text = get("discord_idle_text");
 
   refreshSettings();
   addInputListener(adBlock, settings.adBlock);
   addInputListener(api, settings.api);
-  addSelectListener(channel, settings.advanced.tidalUrl);
   addTextAreaListener(customCSS, settings.customCSS);
   addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
@@ -315,7 +308,6 @@ window.addEventListener("DOMContentLoaded", () => {
     settings.discord.showSong,
     switchesWithSettings.discord_show_song
   );
-  addInputListener(discord_show_idle, settings.discord.showIdle);
   addInputListener(discord_idle_text, settings.discord.idleText);
   addInputListener(discord_using_text, settings.discord.usingText);
 });

src/pages/settings/settings.html

@@ -49,7 +49,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>Notifications</h4>
-                <p>Show a notification when new media starts.</p>
+                <p>Show a notification when a new song starts.</p>
               </div>
               <label class="switch">
                 <input id="notifications" type="checkbox" />
@@ -147,7 +147,7 @@
             <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 media information.
+                TIDAL Hi-Fi has a built-in web API to allow users to get current song information.
                 You can optionally enable playback control as well.
               </p>
             </div>
@@ -227,17 +227,6 @@
             </div>
             <div id="discord_options">
 
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Show Idle Text</h4>
-                  <p>Should the idle text be shown when idle?</p>
-                </div>
-                <label class="switch">
-                  <input id="discord_show_idle" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Idle Text</h4>
@@ -256,8 +245,8 @@
 
               <div class="group__option" class="hidden">
                 <div class="group__description">
-                  <h4>Show media</h4>
+                  <h4>Show song</h4>
-                  <p>Show the current media in the Discord client</p>
+                  <p>Show the current song in the Discord client</p>
                 </div>
                 <label class="switch">
                   <input id="discord_show_song" type="checkbox" />
@@ -289,7 +278,7 @@
                 <div class="group__option">
                   <div class="group__description">
                     <h4>Button text</h4>
-                    <p>Text to display on the button below the media information.</p>
+                    <p>Text to display on the button below the song information.</p>
                     <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
                   </div>
                 </div>
@@ -327,7 +316,7 @@
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
+              <p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
                 immediately</p>
               <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
             </div>
@@ -349,20 +338,6 @@
                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
             </div>
-
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Tidal channel / URL</h4>
-                <p>
-                  Which URL Tidal Hi-Fi should use.
-                  <strong>note! Beta might break at any time</strong>
-                </p>
-                <select class="select-input" id="channel" name="channel">
-                  <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
-                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
-                </select>
-              </div>
-            </div>
           </div>
           <div class="group">
             <p class="group__title">Flags</p>
@@ -468,7 +443,7 @@
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
             <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.14.1">5.14.1</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
@@ -491,4 +466,4 @@
   </div>
 </body>
 
-</html>
+</html>

src/preload.ts

@@ -74,7 +74,7 @@ const elements = {
   },
 
   /**
-   * Get the icon of the current media
+   * Get the icon of the current song
    */
   getSongIcon: function () {
     const figure = this.get("media");
@@ -90,7 +90,7 @@ const elements = {
   },
 
   /**
-   * returns an array of all artists in the current media
+   * returns an array of all artists in the current song
    * @returns {Array} artists
    */
   getArtistsArray: function () {
@@ -195,7 +195,7 @@ function getUpdateFrequency() {
 }
 
 /**
- * Play or pause the current media
+ * Play or pause the current song
  */
 function playPause() {
   const play = elements.get("play");
@@ -394,30 +394,18 @@ function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
   if (mediaInfo) {
     currentMediaInfo = mediaInfo;
     ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
+    if (settingsStore.get(settings.notifications) && notify) {
+      if (currentNotification) currentNotification.close();
+      currentNotification = new Notification({
+        title: mediaInfo.title,
+        body: mediaInfo.artists,
+        icon: mediaInfo.icon,
+      });
+      currentNotification.show();
+    }
+
     updateMpris(mediaInfo);
     updateListenBrainz(mediaInfo);
-    if (notify) {
-      sendNotification(mediaInfo);
-    }
-  }
-}
-
-/**
- * send a desktop notification if enabled in settings
- * @param mediaInfo
- * @param notify Whether to notify
- */
-async function sendNotification(mediaInfo: MediaInfo) {
-  if (settingsStore.get(settings.notifications)) {
-    if (currentNotification) {
-      currentNotification.close();
-    }
-    currentNotification = new Notification({
-      title: mediaInfo.title,
-      body: mediaInfo.artists,
-      icon: mediaInfo.icon,
-    });
-    currentNotification.show();
   }
 }
 

src/scripts/discord.ts

@@ -14,7 +14,7 @@ export let rpc: Client;
 
 const observer = () => {
   if (rpc) {
-    updateActivity();
+    rpc.setActivity(getActivity());
   }
 };
 
@@ -24,15 +24,6 @@ const defaultPresence = {
   instance: false,
 };
 
-const updateActivity = () => {
-  const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
-  if (mediaInfo.status === MediaStatus.paused && !showIdle) {
-    rpc.clearActivity();
-  } else {
-    rpc.setActivity(getActivity());
-  }
-};
-
 const getActivity = (): Presence => {
   const presence: Presence = { ...defaultPresence };
 
@@ -63,33 +54,18 @@ const getActivity = (): Presence => {
     return { includeTimestamps, detailsPrefix, buttonText };
   }
 
-  /**
-   * Pad a string using spaces to at least 2 characters
-   * @param input string to pad with 2 characters
-   * @returns
-   */
-  function pad(input: string): string {
-    return input.padEnd(2, " ");
-  }
-
   function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
-    // discord requires a minimum of 2 characters
-    const title = pad(mediaInfo.title);
-    const album = pad(mediaInfo.album);
-    const artists = pad(mediaInfo.artists);
-
     if (mediaInfo.url) {
-      presence.details = `${detailsPrefix}${title}`;
+      presence.details = `${detailsPrefix}${mediaInfo.title}`;
-      presence.state = artists ? artists : "unknown artist(s)";
+      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
       presence.largeImageKey = mediaInfo.image;
-      if (album) {
+      if (mediaInfo.album) {
-        presence.largeImageText = album;
+        presence.largeImageText = mediaInfo.album;
       }
-
       presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
     } else {
-      presence.details = `Watching ${title}`;
+      presence.details = `Watching ${mediaInfo.title}`;
-      presence.state = artists;
+      presence.state = mediaInfo.artists;
     }
   }
 
@@ -114,13 +90,9 @@ export const initRPC = () => {
   rpc.login({ clientId }).then(
     () => {
       rpc.on("ready", () => {
-        updateActivity();
+        rpc.setActivity(getActivity());
-      });
-
-      const { updateInfo, play, pause, playPause } = globalEvents;
-      [updateInfo, play, pause, playPause].forEach((status) => {
-        ipcMain.on(status, observer);
       });
+      ipcMain.on(globalEvents.updateInfo, observer);
     },
     () => {
       Logger.log("Can't connect to Discord, is it running?");

src/scripts/settings.ts

@@ -28,9 +28,6 @@ const buildMigration = (
 export const settingsStore = new Store({
   defaults: {
     adBlock: false,
-    advanced: {
-      tidalUrl: "https://listen.tidal.com",
-    },
     api: true,
     apiSettings: {
       port: 47836,
@@ -43,7 +40,6 @@ export const settingsStore = new Store({
     enableDiscord: false,
     discord: {
       showSong: true,
-      showIdle: true,
       idleText: "Browsing Tidal",
       usingText: "Playing media on TIDAL",
       includeTimestamps: true,
@@ -111,14 +107,6 @@ export const settingsStore = new Store({
         { key: settings.apiSettings.hostname, value: "127.0.0.1" },
       ]);
     },
-    "5.15.0": (migrationStore) => {
-      buildMigration("5.15.0", migrationStore, [
-        { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
-      ]);
-    },
-    "5.16.0": (migrationStore) => {
-      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
-    },
   },
 });