Merge 1b4c1e1cd8 into 6e43cbb4d7

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
     branches-ignore:
       - master
       - develop
-  workflow_dispatch:
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest
@@ -21,7 +20,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 +30,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 +40,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

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches:
       - master
-  workflow_dispatch:
 
 jobs:
   build_on_linux:
@@ -21,7 +20,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 +34,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 +48,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

.vscode/http/settings/skipped-artists/addArtists.http

@@ -1,5 +0,0 @@
-POST /settings/skipped-artists HTTP/1.1
-Host: localhost:47836
-Content-Type: application/json
-
-["abc", "def"]

.vscode/http/settings/skipped-artists/addCurrent.http

@@ -1,2 +0,0 @@
-POST /settings/skipped-artists/current HTTP/1.1
-Host: localhost:47836

.vscode/http/settings/skipped-artists/removeArtists.http

@@ -1,5 +0,0 @@
-POST /settings/skipped-artists/delete HTTP/1.1
-Host: localhost:47836
-Content-Type: application/json
-
-["abc", "def"]

.vscode/http/settings/skipped-artists/removeCurrent.http

@@ -1,2 +0,0 @@
-DELETE /settings/skipped-artists/current HTTP/1.1
-Host: localhost:47836

.vscode/settings.json

@@ -2,7 +2,6 @@
   "cSpell.words": [
     "Brainz",
     "Castlabs",
-    "Fi's",
     "flac",
     "Flatpak",
     "geqnfr",

CHANGELOG.md

@@ -4,59 +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
-- Added all mediaInfo to mpris interface using the `custom:` prefix
-
-## [5.14]
-
-- Simplified `MediaInfo` & `Options` types
-- Added `playingFrom` information to the info API
-  - also changed the way we update Album info since Playing From now shows the correct Album.
-- API now allows you to set the `hostname` so you can control who can interact with the API.
-- Reworked swagger generation hotfix to properly generate `swagger.json` during the compile step
-  - Might switch to tsoa in the future, idk yet.
-- Added [Tidal Magazine](https://tidal.com/magazine/) integration (in the menubar or use `Ctrl + M`)
-
-## [5.13.1]
-
-- removed Swagger generation step in favor of pre-generated file.
-  - This also fixes the API issue [#409](https://github.com/Mastermindzh/tidal-hifi/issues/409)
-  - This also stops TIDAL-hifi from scanning your entire home directory... the glob was very broad apparently.
-
-## [5.13.0]
-
-- Fixed [#403](https://github.com/Mastermindzh/tidal-hifi/issues/403) "cannot read shuffle of undefined" error
-- Added an API to add & delete entries from the skippedArtists list in the settings. fixes [#405](https://github.com/Mastermindzh/tidal-hifi/issues/405)
-  - `GET /settings/skipped-artists` -> get list of skipped artists
-  - `POST /settings/skipped-artists` -> add to the list of skipped artists
-  - `POST /settings/skipped-artists/delete` -> delete from the list of skipped artists
-  - `POST /settings/skipped-artists/current` -> skip the current artist
-  - `DELETE /settings/skipped-artists/current` -> delete the current artist from the skip list
-  - Added Swagger documentation to the new endpoints:
-    ![picture of swagger documentation](./docs/images/swagger.png)
-- CORS support added by [Mjokfox](https://github.com/Mjokfox)
-
-## [5.12.0]
-
-- Added Shuffle and Repeat state to API response - By [ThatGravyBoat](https://github.com/ThatGravyBoat)
-
 ## [5.11.0]
 
 - Re-implemented the API, added support for duration/current in seconds & shuffle+repeat

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)
@@ -43,14 +43,13 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
 - Better icons thanks to [Papirus-icon-theme](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/)
 - [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
-- API for status, playback and settings (see the [/docs](http://localhost:47836/docs/) route)
+- 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))
 - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
 - Custom [integrations](#integrations)
   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
   - Songwhip.com integration (hotkey `ctrl + w`)
   - Discord RPC integration (showing "now listening", "Browsing", etc)
-    - Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
   - MPRIS integration
 - UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)
 
@@ -131,7 +130,7 @@ nix-env -iA nixpkgs.tidal-hifi
 
 To install and work with the code on this project follow these steps:
 
-- `git clone https://github.com/Mastermindzh/tidal-hifi.git`
+- `git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)`
 - `cd tidal-hifi`
 - `npm install`
 - `npm run watch` to watch for auto-reload of Typescript/SCSS changes.
@@ -153,13 +152,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.11.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -8,10 +8,9 @@
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
     "deps": "npm run watch",
-    "watch": "tsc-watch --onSuccess \"npm run compile-all\"",
+    "watch": "tsc-watch --onSuccess \"npm run sass-and-copy\"",
     "copy-files": "copyfiles -u 1 --exclude './src/**/*.ts' --exclude './src/**/*.scss' \"./src/**/*\" ts-dist",
     "copy-themes-dev": "copyfiles -u 1 \"./themes/*\" node_modules/electron/dist/resources",
-    "compile-all": "npm run sass-and-copy && ts-node scripts/generate-swagger.ts",
     "sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev",
     "build": "npm run builder -- -c ./build/electron-builder.yml",
     "build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml",
@@ -41,8 +40,7 @@
   "license": "MIT",
   "dependencies": {
     "@electron/remote": "^2.1.2",
-    "@types/swagger-jsdoc": "^6.0.4",
+    "axios": "^1.6.8",
-    "axios": "^1.7.2",
     "cors": "^2.8.5",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.2.0",
@@ -50,35 +48,31 @@
     "hotkeys-js": "^3.13.7",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.77.8",
+    "sass": "^1.75.0"
-    "swagger-ui-express": "^5.0.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
     "@types/cors": "^2.8.17",
     "@types/discord-rpc": "^4.0.8",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.10.6",
     "@types/request": "^2.48.12",
-    "@types/swagger-ui-express": "^4.1.6",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^6.18.0",
-    "@typescript-eslint/parser": "^7.15.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",
+    "tsc-watch": "^6.0.4",
-    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
-    "tsc-watch": "^6.2.0",
-    "typescript": "^5.5.3"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

scripts/generate-swagger.ts

@@ -1,30 +0,0 @@
-import fs from "fs";
-import swaggerjsdoc from "swagger-jsdoc";
-import packagejson from "./../package.json";
-
-const specs = swaggerjsdoc({
-  definition: {
-    openapi: "3.1.0",
-    info: {
-      title: "TIDAL Hi-Fi API",
-      version: packagejson.version,
-      description: "",
-      license: {
-        name: packagejson.license,
-        url: "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE",
-      },
-      contact: {
-        name: "Rick <mastermindzh> van Lieshout",
-        url: "https://www.rickvanlieshout.com",
-      },
-    },
-    externalDocs: {
-      description: "swagger.json",
-      url: "swagger.json",
-    },
-  },
-  apis: ["**/*.ts"],
-});
-
-fs.writeFileSync("src/features/api/swagger.json", JSON.stringify(specs, null, 2), "utf8");
-console.log("Written swagger.json");

scripts/verifyElements.js

@@ -25,8 +25,7 @@
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+    album_header_title: '.header-details [data-test="title"]',
-    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
     currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
     album_name_cell: '[class^="album"]',
     tracklist_row: '[data-test="tracklist-row"]',

src/constants/settings.ts

@@ -10,15 +10,10 @@
  */
 export const settings = {
   adBlock: "adBlock",
-  advanced: {
-    root: "advanced",
-    tidalUrl: "advanced.tidalUrl",
-  },
   api: "api",
   apiSettings: {
     root: "apiSettings",
     port: "apiSettings.port",
-    hostname: "apiSettings.hostname",
   },
   customCSS: "customCSS",
   disableBackgroundThrottle: "disableBackgroundThrottle",
@@ -30,7 +25,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/current.ts

@@ -3,110 +3,7 @@ import fs from "fs";
 import { mediaInfo } from "../../../scripts/mediaInfo";
 
 export const addCurrentInfo = (expressApp: Router) => {
-  /**
-   * @swagger
-   * tags:
-   *   name: current
-   *   description: The current media info API
-   * components:
-   *   schemas:
-   *     MediaInfo:
-   *       type: object
-   *       properties:
-   *         title:
-   *           type: string
-   *         artists:
-   *           type: string
-   *         album:
-   *           type: string
-   *         icon:
-   *           type: string
-   *           format: uri
-   *         playingFrom:
-   *           type: string
-   *         status:
-   *           type: string
-   *         url:
-   *           type: string
-   *           format: uri
-   *         current:
-   *           type: string
-   *         currentInSeconds:
-   *           type: integer
-   *         duration:
-   *           type: string
-   *         durationInSeconds:
-   *           type: integer
-   *         image:
-   *           type: string
-   *           format: uri
-   *         favorite:
-   *           type: boolean
-   *         player:
-   *           type: object
-   *           properties:
-   *             status:
-   *               type: string
-   *             shuffle:
-   *               type: boolean
-   *             repeat:
-   *               type: string
-   *         artist:
-   *           type: string
-   *       example:
-   *         title: "Sample Title"
-   *         artists: "Sample Artist"
-   *         album: "Sample Album"
-   *         icon: "/path/to/sample/icon.jpg"
-   *         playingFrom: "Sample Playlist"
-   *         status: "playing"
-   *         url: "https://tidal.com/browse/track/sample"
-   *         current: "1:23"
-   *         currentInSeconds: 83
-   *         duration: "3:45"
-   *         durationInSeconds: 225
-   *         image: "https://example.com/sample-image.jpg"
-   *         favorite: true
-   *         player:
-   *           status: "playing"
-   *           shuffle: true
-   *           repeat: "one"
-   *         artist: "Sample Artist"
-   */
-
-  /**
-   * @swagger
-   * /current:
-   *   get:
-   *     summary: Get current media info
-   *     tags: [current]
-   *     responses:
-   *       200:
-   *         description: Current media info
-   *         content:
-   *           application/json:
-   *             schema:
-   *               $ref: '#/components/schemas/MediaInfo'
-   */
   expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
-
-  /**
-   * @swagger
-   * /current/image:
-   *   get:
-   *     summary: Get current media image
-   *     tags: [current]
-   *     responses:
-   *       200:
-   *         description: Current media image
-   *         content:
-   *           image/png:
-   *             schema:
-   *               type: string
-   *               format: binary
-   *       404:
-   *         description: Not found
-   */
   expressApp.get("/current/image", getCurrentImage);
 };
 

src/features/api/features/player.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { BrowserWindow } from "electron";
 import { Router } from "express";
 import { globalEvents } from "../../../constants/globalEvents";
@@ -11,148 +12,19 @@ export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow
   const windowEvent = handleWindowEvent(mainWindow);
   const createRoute = (route: string) => `/player${route}`;
 
-  /**
-   * @swagger
-   * tags:
-   *   name: player
-   *   description: The player control API
-   * components:
-   *   schemas:
-   *     OkResponse:
-   *       type: string
-   *       example: "OK"
-   */
   const createPlayerAction = (route: string, action: string) => {
     expressApp.post(createRoute(route), (req, res) => windowEvent(res, action));
   };
 
   if (settingsStore.get(settings.playBackControl)) {
-    /**
-     * @swagger
-     * /player/play:
-     *   post:
-     *     summary: Play the current media
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/play", globalEvents.play);
-
-    /**
-     * @swagger
-     * /player/favorite/toggle:
-     *   post:
-     *     summary: Add the current media to your favorites, or remove it if its already added to your favorites
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite);
-
-    /**
-     * @swagger
-     * /player/pause:
-     *   post:
-     *     summary: Pause the current media
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/pause", globalEvents.pause);
-
-    /**
-     * @swagger
-     * /player/next:
-     *   post:
-     *     summary: Play the next song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     createPlayerAction("/next", globalEvents.next);
-
-    /**
-     * @swagger
-     * /player/previous:
-     *   post:
-     *     summary: Play the previous song
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     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:
-     *   post:
-     *     summary: Start playing the media if paused, or pause the media if playing
-     *     tags: [player]
-     *     responses:
-     *       200:
-     *         description: Ok
-     *         content:
-     *           text/plain:
-     *             schema:
-     *               $ref: '#/components/schemas/OkResponse'
-     */
     expressApp.post(createRoute("/playpause"), (req, res) => {
       if (mediaInfo.status === MediaStatus.playing) {
         windowEvent(res, globalEvents.pause);

src/features/api/features/settings/settings.ts

@@ -1,121 +0,0 @@
-import { Request, Router } from "express";
-import { settings } from "../../../../constants/settings";
-import { mediaInfo } from "../../../../scripts/mediaInfo";
-import {
-  addSkippedArtists,
-  removeSkippedArtists,
-  settingsStore,
-} from "../../../../scripts/settings";
-import { BrowserWindow } from "electron";
-import { globalEvents } from "../../../../constants/globalEvents";
-
-/**
- * @swagger
- * tags:
- *   name: settings
- *   description: The settings management API
- * components:
- *   schemas:
- *     StringArray:
- *       type: array
- *       items:
- *         type: string
- *       example: ["Artist1", "Artist2"]
- *
- * @param expressApp
- * @param mainWindow
- */
-export const addSettingsAPI = (expressApp: Router, mainWindow: BrowserWindow) => {
-  /**
-   * @swagger
-   * /settings/skipped-artists:
-   *   get:
-   *     summary: get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *         description: The list book.
-   *         content:
-   *           application/json:
-   *             schema:
-   *              $ref: '#/components/schemas/StringArray'
-   */
-  expressApp.get("/settings/skipped-artists", (req, res) => {
-    res.json(settingsStore.get<string, string[]>(settings.skippedArtists));
-  });
-
-  /**
-   * @swagger
-   * /settings/skipped-artists:
-   *   post:
-   *     summary: Add new artists to the list of skipped artists
-   *     tags: [settings]
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             $ref: '#/components/schemas/StringArray'
-   *     responses:
-   *       200:
-   *         description: Ok
-   */
-  expressApp.post("/settings/skipped-artists", (req: Request<object, object, string[]>, res) => {
-    addSkippedArtists(req.body);
-    res.sendStatus(200);
-  });
-
-  /**
-   * @swagger
-   * /settings/skipped-artists/delete:
-   *   post:
-   *     summary: Remove artists from the list of skipped artists
-   *     tags: [settings]
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             $ref: '#/components/schemas/StringArray'
-   *     responses:
-   *       200:
-   *         description: Ok
-   */
-  expressApp.post(
-    "/settings/skipped-artists/delete",
-    (req: Request<object, object, string[]>, res) => {
-      removeSkippedArtists(req.body);
-      res.sendStatus(200);
-    }
-  );
-
-  /**
-   * @swagger
-   * /settings/skipped-artists/current:
-   *   post:
-   *     summary: Add the current artist to the list of skipped artists
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *        description: Ok
-   */
-  expressApp.post("/settings/skipped-artists/current", (req, res) => {
-    addSkippedArtists([mediaInfo.artists]);
-    mainWindow.webContents.send("globalEvent", globalEvents.next);
-    res.sendStatus(200);
-  });
-  /**
-   * @swagger
-   * /settings/skipped-artists/current:
-   *   delete:
-   *     summary: Remove the current artist from the list of skipped artists
-   *     tags: [settings]
-   *     responses:
-   *       200:
-   *        description: Ok
-   */
-  expressApp.delete("/settings/skipped-artists/current", (req, res) => {
-    removeSkippedArtists([mediaInfo.artists]);
-    res.sendStatus(200);
-  });
-};

src/features/api/index.ts

@@ -1,36 +1,27 @@
-import cors from "cors";
 import { BrowserWindow, dialog } from "electron";
 import express from "express";
-import swaggerUi from "swagger-ui-express";
+import { settings } from "../../constants/settings";
 import { settingsStore } from "../../scripts/settings";
-import { settings } from "./../../constants/settings";
 import { addCurrentInfo } from "./features/current";
 import { addPlaybackControl } from "./features/player";
-import { addSettingsAPI } from "./features/settings/settings";
 import { addLegacyApi } from "./legacy";
-import swaggerSpec from "./swagger.json";
+import cors from "cors";
 
 /**
  * Function to enable TIDAL Hi-Fi's express api
  */
 export const startApi = (mainWindow: BrowserWindow) => {
-  const port = settingsStore.get<string, number>(settings.apiSettings.port);
-  const hostname = settingsStore.get<string, string>(settings.apiSettings.hostname) ?? "127.0.0.1";
-
   const expressApp = express();
   expressApp.use(cors());
-  expressApp.use(express.json());
-  expressApp.use("/docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
   expressApp.get("/", (req, res) => res.send("Hello World!"));
-  expressApp.get("/swagger.json", (req, res) => res.json(swaggerSpec));
 
   // add features
   addLegacyApi(expressApp, mainWindow);
   addPlaybackControl(expressApp, mainWindow);
   addCurrentInfo(expressApp);
-  addSettingsAPI(expressApp, mainWindow);
 
-  const expressInstance = expressApp.listen(port, hostname);
+  const port = settingsStore.get<string, number>(settings.apiSettings.port);
+  const expressInstance = expressApp.listen(port, "127.0.0.1");
   expressInstance.on("error", function (e: { code: string }) {
     let message = e.code;
     if (e.code === "EADDRINUSE") {

src/features/api/legacy.ts

@@ -13,132 +13,19 @@ import { getCurrentImage } from "./features/current";
  * @param mainWindow
  */
 export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
-  /**
-   * @swagger
-   * /image:
-   *   get:
-   *     summary: Get current image
-   *     tags: [legacy]
-   *     deprecated: true
-   *     responses:
-   *       200:
-   *         description: Current image
-   *         content:
-   *           image/png:
-   *             schema:
-   *               type: string
-   *               format: binary
-   *       404:
-   *         description: Not found
-   */
   expressApp.get("/image", getCurrentImage);
 
   if (settingsStore.get(settings.playBackControl)) {
     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

@@ -1,582 +0,0 @@
-{
-  "openapi": "3.1.0",
-  "info": {
-    "title": "TIDAL Hi-Fi API",
-    "version": "5.16.0",
-    "description": "",
-    "license": {
-      "name": "MIT",
-      "url": "https://github.com/Mastermindzh/tidal-hifi/blob/master/LICENSE"
-    },
-    "contact": {
-      "name": "Rick <mastermindzh> van Lieshout",
-      "url": "https://www.rickvanlieshout.com"
-    }
-  },
-  "externalDocs": {
-    "description": "swagger.json",
-    "url": "swagger.json"
-  },
-  "paths": {
-    "/current": {
-      "get": {
-        "summary": "Get current media info",
-        "tags": [
-          "current"
-        ],
-        "responses": {
-          "200": {
-            "description": "Current media info",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/MediaInfo"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/current/image": {
-      "get": {
-        "summary": "Get current media image",
-        "tags": [
-          "current"
-        ],
-        "responses": {
-          "200": {
-            "description": "Current media image",
-            "content": {
-              "image/png": {
-                "schema": {
-                  "type": "string",
-                  "format": "binary"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
-          }
-        }
-      }
-    },
-    "/player/play": {
-      "post": {
-        "summary": "Play the current media",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/favorite/toggle": {
-      "post": {
-        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/pause": {
-      "post": {
-        "summary": "Pause the current media",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/next": {
-      "post": {
-        "summary": "Play the next song",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/previous": {
-      "post": {
-        "summary": "Play the previous song",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/player/shuffle/toggle": {
-      "post": {
-        "summary": "Play the previous song",
-        "tags": [
-          "player"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok",
-            "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": {
-                  "$ref": "#/components/schemas/OkResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists": {
-      "get": {
-        "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": [
-          "settings"
-        ],
-        "responses": {
-          "200": {
-            "description": "The list book.",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/StringArray"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "summary": "Add new artists to the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/StringArray"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists/delete": {
-      "post": {
-        "summary": "Remove artists from the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/StringArray"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/settings/skipped-artists/current": {
-      "post": {
-        "summary": "Add the current artist to the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      },
-      "delete": {
-        "summary": "Remove the current artist from the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
-        "responses": {
-          "200": {
-            "description": "Ok"
-          }
-        }
-      }
-    },
-    "/image": {
-      "get": {
-        "summary": "Get current image",
-        "tags": [
-          "legacy"
-        ],
-        "deprecated": true,
-        "responses": {
-          "200": {
-            "description": "Current image",
-            "content": {
-              "image/png": {
-                "schema": {
-                  "type": "string",
-                  "format": "binary"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not found"
-          }
-        }
-      }
-    },
-    "/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": {
-    "schemas": {
-      "MediaInfo": {
-        "type": "object",
-        "properties": {
-          "title": {
-            "type": "string"
-          },
-          "artists": {
-            "type": "string"
-          },
-          "album": {
-            "type": "string"
-          },
-          "icon": {
-            "type": "string",
-            "format": "uri"
-          },
-          "playingFrom": {
-            "type": "string"
-          },
-          "status": {
-            "type": "string"
-          },
-          "url": {
-            "type": "string",
-            "format": "uri"
-          },
-          "current": {
-            "type": "string"
-          },
-          "currentInSeconds": {
-            "type": "integer"
-          },
-          "duration": {
-            "type": "string"
-          },
-          "durationInSeconds": {
-            "type": "integer"
-          },
-          "image": {
-            "type": "string",
-            "format": "uri"
-          },
-          "favorite": {
-            "type": "boolean"
-          },
-          "player": {
-            "type": "object",
-            "properties": {
-              "status": {
-                "type": "string"
-              },
-              "shuffle": {
-                "type": "boolean"
-              },
-              "repeat": {
-                "type": "string"
-              }
-            }
-          },
-          "artist": {
-            "type": "string"
-          }
-        },
-        "example": {
-          "title": "Sample Title",
-          "artists": "Sample Artist",
-          "album": "Sample Album",
-          "icon": "/path/to/sample/icon.jpg",
-          "playingFrom": "Sample Playlist",
-          "status": "playing",
-          "url": "https://tidal.com/browse/track/sample",
-          "current": "1:23",
-          "currentInSeconds": 83,
-          "duration": "3:45",
-          "durationInSeconds": 225,
-          "image": "https://example.com/sample-image.jpg",
-          "favorite": true,
-          "player": {
-            "status": "playing",
-            "shuffle": true,
-            "repeat": "one"
-          },
-          "artist": "Sample Artist"
-        }
-      },
-      "OkResponse": {
-        "type": "string",
-        "example": "OK"
-      },
-      "StringArray": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        },
-        "example": [
-          "Artist1",
-          "Artist2"
-        ]
-      }
-    }
-  },
-  "tags": [
-    {
-      "name": "current",
-      "description": "The current media info API"
-    },
-    {
-      "name": "player",
-      "description": "The player control API"
-    },
-    {
-      "name": "settings",
-      "description": "The settings management API"
-    }
-  ]
-}

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/models/mediaInfo.ts

@@ -1,4 +1,3 @@
-import { MediaPlayerInfo } from "./mediaPlayerInfo";
 import { MediaStatus } from "./mediaStatus";
 
 export interface MediaInfo {
@@ -8,12 +7,10 @@ export interface MediaInfo {
   icon: string;
   status: MediaStatus;
   url: string;
-  playingFrom: string;
   current: string;
   currentInSeconds?: number;
   duration: string;
   durationInSeconds?: number;
   image: string;
   favorite: boolean;
-  player?: MediaPlayerInfo;
 }

src/models/mediaPlayerInfo.ts

@@ -1,8 +0,0 @@
-import { RepeatState } from "./repeatState";
-import { MediaStatus } from "./mediaStatus";
-
-export interface MediaPlayerInfo {
-  status: MediaStatus;
-  shuffle: boolean;
-  repeat: RepeatState;
-}

src/models/options.ts

@@ -0,0 +1,15 @@
+export interface Options {
+  title: string;
+  artists: string;
+  album: string;
+  status: string;
+  url: string;
+  current: string;
+  currentInSeconds: number;
+  duration: string;
+  durationInSeconds: number;
+  "app-name": string;
+  image: string;
+  icon: string;
+  favorite: boolean;
+}

src/models/repeatState.ts

@@ -1,5 +0,0 @@
-export enum RepeatState {
-  off = "off",
-  all = "all",
-  single = "single",
-}

src/pages/settings/preload.ts

@@ -24,19 +24,17 @@ const switchesWithSettings = {
     switch: "discord_show_song",
     classToHide: "discord_show_song_options",
     settingsKey: settings.discord.showSong,
-  },
+  }
 };
 
 let adBlock: HTMLInputElement,
   api: HTMLInputElement,
-  channel: HTMLSelectElement,
   customCSS: HTMLInputElement,
   disableBackgroundThrottle: HTMLInputElement,
   disableHardwareMediaKeys: HTMLInputElement,
   enableCustomHotkeys: HTMLInputElement,
   enableDiscord: HTMLInputElement,
   gpuRasterization: HTMLInputElement,
-  hostname: HTMLInputElement,
   menuBar: HTMLInputElement,
   minimizeOnClose: HTMLInputElement,
   mpris: HTMLInputElement,
@@ -58,7 +56,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 +120,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);
@@ -131,7 +127,6 @@ function refreshSettings() {
     enableDiscord.checked = settingsStore.get(settings.enableDiscord);
     enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
     gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
-    hostname.value = settingsStore.get(settings.apiSettings.hostname);
     menuBar.checked = settingsStore.get(settings.menuBar);
     minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
     mpris.checked = settingsStore.get(settings.mpris);
@@ -152,7 +147,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 +236,6 @@ window.addEventListener("DOMContentLoaded", () => {
 
   adBlock = get("adBlock");
   api = get("apiCheckbox");
-  channel = get<HTMLSelectElement>("channel");
   customCSS = get("customCSS");
   disableBackgroundThrottle = get("disableBackgroundThrottle");
   disableHardwareMediaKeys = get("disableHardwareMediaKeys");
@@ -250,7 +243,6 @@ window.addEventListener("DOMContentLoaded", () => {
   enableDiscord = get("enableDiscord");
   enableWaylandSupport = get("enableWaylandSupport");
   gpuRasterization = get("gpuRasterization");
-  hostname = get("hostname");
   menuBar = get("menuBar");
   minimizeOnClose = get("minimizeOnClose");
   mpris = get("mprisCheckbox");
@@ -271,14 +263,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");
+  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);
@@ -286,7 +276,6 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
   addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
   addInputListener(gpuRasterization, settings.flags.gpuRasterization);
-  addInputListener(hostname, settings.apiSettings.hostname);
   addInputListener(menuBar, settings.menuBar);
   addInputListener(minimizeOnClose, settings.minimizeOnClose);
   addInputListener(mpris, settings.mpris);
@@ -310,12 +299,7 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
   addInputListener(discord_include_timestamps, settings.discord.includeTimestamps);
   addInputListener(discord_button_text, settings.discord.buttonText);
-  addInputListener(
+  addInputListener(discord_show_song, settings.discord.showSong, switchesWithSettings.discord_show_song);
-    discord_show_song,
-    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>
@@ -167,16 +167,6 @@
                 <input id="port" type="number" class="text-input" name="port" />
               </div>
             </div>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>API hostname</h4>
-                <p>By default (127.0.0.1) only local apps can interface with the API. <br />
-                  Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
-                  Other options are available
-                </p>
-                <input id="hostname" type="text" class="text-input" name="hostname" />
-              </div>
-            </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Playback control</h4>
@@ -227,17 +217,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 +235,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 +268,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 +306,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 +328,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 +433,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.11.0">5.11.0</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"

src/preload.ts

@@ -13,16 +13,15 @@ import { Logger } from "./features/logger";
 import { Songwhip } from "./features/songwhip/songwhip";
 import { addCustomCss } from "./features/theming/theming";
 import { convertDurationToSeconds } from "./features/time/parse";
-import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
-import { RepeatState } from "./models/repeatState";
+import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
-import { ObjectToDotNotation } from "./scripts/objectUtilities";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
+const appName = "TIDAL Hi-Fi";
 let currentSong = "";
 let player: Player;
 let currentPlayStatus = MediaStatus.paused;
@@ -30,9 +29,7 @@ let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
 let scrobbleWaitingForDelay = false;
 
 let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
+let currentMediaInfo: Options;
-let currentShuffleState = false;
-let currentMediaInfo: MediaInfo;
 let currentNotification: Electron.Notification;
 
 const elements = {
@@ -57,9 +54,7 @@ const elements = {
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
   mediaItem: "[data-type='mediaItem']",
-  album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
+  album_header_title: '.header-details [data-test="title"]',
-  playing_from: '*[class^="playingFrom"] span:nth-child(2)',
-  queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
   currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
   album_name_cell: '[class^="album"]',
   tracklist_row: '[data-test="tracklist-row"]',
@@ -74,7 +69,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 +85,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 () {
@@ -135,12 +130,6 @@ const elements = {
       }
     }
 
-    // see whether we're on the queue page and get it from there
-    const queueAlbumName = elements.getText("queue_album");
-    if (queueAlbumName) {
-      return queueAlbumName;
-    }
-
     return "";
   },
 
@@ -195,7 +184,7 @@ function getUpdateFrequency() {
 }
 
 /**
- * Play or pause the current media
+ * Play or pause the current song
  */
 function playPause() {
   const play = elements.get("play");
@@ -359,23 +348,6 @@ function getCurrentlyPlayingStatus() {
   return status;
 }
 
-function getCurrentShuffleState() {
-  const shuffle = elements.get("shuffle");
-  return shuffle?.getAttribute("aria-checked") === "true";
-}
-
-function getCurrentRepeatState() {
-  const repeat = elements.get("repeat");
-  switch (repeat?.getAttribute("data-type")) {
-    case "button__repeatAll":
-      return RepeatState.all;
-    case "button__repeatSingle":
-      return RepeatState.single;
-    default:
-      return RepeatState.off;
-  }
-}
-
 /**
  * Convert the duration from MM:SS to seconds
  * @param {*} duration
@@ -388,36 +360,23 @@ function convertDuration(duration: string) {
 /**
  * Update Tidal-hifi's media info
  *
- * @param {*} mediaInfo
+ * @param {*} options
  */
-function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
+function updateMediaInfo(options: Options, notify: boolean) {
-  if (mediaInfo) {
+  if (options) {
-    currentMediaInfo = mediaInfo;
+    currentMediaInfo = options;
-    ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
+    ipcRenderer.send(globalEvents.updateInfo, options);
-    updateMpris(mediaInfo);
+    if (settingsStore.get(settings.notifications) && notify) {
-    updateListenBrainz(mediaInfo);
+      if (currentNotification) currentNotification.close();
-    if (notify) {
+      currentNotification = new Notification({
-      sendNotification(mediaInfo);
+        title: options.title,
+        body: options.artists,
+        icon: options.icon,
+      });
+      currentNotification.show();
     }
-  }
+    updateMpris(options);
-}
+    updateListenBrainz(options);
-
-/**
- * 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();
   }
 }
 
@@ -475,33 +434,32 @@ function addMPRIS() {
   }
 }
 
-function updateMpris(mediaInfo: MediaInfo) {
+function updateMpris(options: Options) {
   if (player) {
     player.metadata = {
       ...player.metadata,
       ...{
-        "xesam:title": mediaInfo.title,
+        "xesam:title": options.title,
-        "xesam:artist": [mediaInfo.artists],
+        "xesam:artist": [options.artists],
-        "xesam:album": mediaInfo.album,
+        "xesam:album": options.album,
-        "mpris:artUrl": mediaInfo.image,
+        "mpris:artUrl": options.image,
-        "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
+        "mpris:length": convertDuration(options.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
       },
-      ...ObjectToDotNotation(mediaInfo, "custom:"),
     };
-    player.playbackStatus = mediaInfo.status === MediaStatus.paused ? "Paused" : "Playing";
+    player.playbackStatus = options.status === MediaStatus.paused ? "Paused" : "Playing";
   }
 }
 
 /**
  * Update the listenbrainz service with new data based on a few conditions
  */
-function updateListenBrainz(mediaInfo: MediaInfo) {
+function updateListenBrainz(options: Options) {
   if (settingsStore.get(settings.ListenBrainz.enabled)) {
     const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
     if (
-      (!oldData && mediaInfo.status === MediaStatus.playing) ||
+      (!oldData && options.status === MediaStatus.playing) ||
-      (oldData && oldData.title !== mediaInfo.title)
+      (oldData && oldData.title !== options.title)
     ) {
       if (!scrobbleWaitingForDelay) {
         scrobbleWaitingForDelay = true;
@@ -509,10 +467,10 @@ function updateListenBrainz(mediaInfo: MediaInfo) {
         currentListenBrainzDelayId = setTimeout(
           () => {
             ListenBrainz.scrobble(
-              mediaInfo.title,
+              options.title,
-              mediaInfo.artists,
+              options.artists,
-              mediaInfo.status,
+              options.status,
-              convertDuration(mediaInfo.duration)
+              convertDuration(options.duration)
             );
             scrobbleWaitingForDelay = false;
           },
@@ -553,44 +511,32 @@ setInterval(function () {
   const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
   const current = elements.getText("current");
   const currentStatus = getCurrentlyPlayingStatus();
-  const shuffleState = getCurrentShuffleState();
-  const repeatState = getCurrentRepeatState();
 
   const playStateChanged = currentStatus != currentlyPlaying;
-  const shuffleStateChanged = shuffleState != currentShuffleState;
-  const repeatStateChanged = repeatState != currentRepeatState;
-
-  const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
 
   // update info if song changed or was just paused/resumed
-  if (titleOrArtistsChanged || hasStateChanged) {
+  if (titleOrArtistsChanged || playStateChanged) {
-    if (playStateChanged) currentlyPlaying = currentStatus;
+    if (playStateChanged) {
-    if (shuffleStateChanged) currentShuffleState = shuffleState;
+      currentlyPlaying = currentStatus;
-    if (repeatStateChanged) currentRepeatState = repeatState;
+    }
-
     skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+
     const album = elements.getAlbumName();
     const duration = elements.getText("duration");
-    const options: MediaInfo = {
+    const options = {
       title,
       artists: artistsString,
       album: album,
-      playingFrom: elements.getText("playing_from"),
       status: currentStatus,
       url: getTrackURL(),
       current,
       currentInSeconds: convertDurationToSeconds(current),
       duration,
       durationInSeconds: convertDurationToSeconds(duration),
+      "app-name": appName,
       image: "",
       icon: "",
       favorite: elements.isFavorite(),
-
-      player: {
-        status: currentStatus,
-        shuffle: shuffleState,
-        repeat: repeatState,
-      },
     };
 
     // update title, url and play info with new info

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/mediaInfo.ts

@@ -1,14 +1,12 @@
 import { MediaInfo } from "../models/mediaInfo";
 import { MediaStatus } from "../models/mediaStatus";
-import { RepeatState } from "../models/repeatState";
 
-const defaultInfo: MediaInfo = {
+export const mediaInfo = {
   title: "",
   artists: "",
   album: "",
   icon: "",
-  playingFrom: "",
+  status: MediaStatus.paused as string,
-  status: MediaStatus.paused,
   url: "",
   current: "",
   currentInSeconds: 0,
@@ -16,21 +14,32 @@ const defaultInfo: MediaInfo = {
   durationInSeconds: 0,
   image: "tidal-hifi-icon",
   favorite: false,
-
-  player: {
-    status: MediaStatus.paused,
-    shuffle: false,
-    repeat: RepeatState.off,
-  },
 };
 
-export let mediaInfo: MediaInfo = { ...defaultInfo };
-
 export const updateMediaInfo = (arg: MediaInfo) => {
-  mediaInfo = { ...defaultInfo, ...arg };
+  mediaInfo.title = propOrDefault(arg.title);
-  mediaInfo.url = toUniversalUrl(mediaInfo.url);
+  mediaInfo.artists = propOrDefault(arg.artists);
+  mediaInfo.album = propOrDefault(arg.album);
+  mediaInfo.icon = propOrDefault(arg.icon);
+  mediaInfo.url = toUniversalUrl(propOrDefault(arg.url));
+  mediaInfo.status = propOrDefault(arg.status);
+  mediaInfo.current = propOrDefault(arg.current);
+  mediaInfo.currentInSeconds = arg.currentInSeconds ?? 0;
+  mediaInfo.duration = propOrDefault(arg.duration);
+  mediaInfo.durationInSeconds = arg.durationInSeconds ?? 0;
+  mediaInfo.image = propOrDefault(arg.image);
+  mediaInfo.favorite = arg.favorite;
 };
 
+/**
+ * Return the property or a default value
+ * @param {*} prop property to check
+ * @param {*} defaultValue defaults to ""
+ */
+function propOrDefault(prop: string, defaultValue = "") {
+  return prop || defaultValue;
+}
+
 /**
  * Append the universal link syntax (?u) to any url
  * @param url url to append the universal link syntax to

src/scripts/menu.ts

@@ -11,23 +11,6 @@ const settingsMenuEntry = {
   accelerator: "Control+=",
 };
 
-const tidalMagazineEntry = {
-  label: "Magazine",
-  click() {
-    const magazineWindow = new BrowserWindow({
-      autoHideMenuBar: true,
-      webPreferences: {
-        sandbox: false,
-        plugins: true,
-        devTools: true, // I like tinkering, others might too
-      },
-    });
-    magazineWindow.loadURL("https://tidal.com/magazine/");
-    magazineWindow.show();
-  },
-  accelerator: "Control+M",
-};
-
 const quitMenuEntry = {
   label: "Quit",
   click() {
@@ -58,7 +41,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
               { role: "hideothers" },
               { role: "unhide" },
               { type: "separator" },
-              tidalMagazineEntry,
               quitMenuEntry,
             ],
           },
@@ -66,7 +48,7 @@ export const getMenu = function (mainWindow: BrowserWindow) {
       : []),
     {
       label: "File",
-      submenu: [settingsMenuEntry, tidalMagazineEntry, isMac ? { role: "close" } : quitMenuEntry],
+      submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
     },
     {
       label: "Edit",
@@ -119,7 +101,6 @@ export const getMenu = function (mainWindow: BrowserWindow) {
     },
     settingsMenuEntry,
     toggleWindow,
-    tidalMagazineEntry,
     quitMenuEntry,
   ];
 

src/scripts/objectUtilities.ts

@@ -1,13 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const ObjectToDotNotation = (obj: any, prefix: string = "", target: any = {}) => {
-  Object.keys(obj).forEach((key: string) => {
-    if (typeof obj[key] === "object" && obj[key] !== null) {
-      ObjectToDotNotation(obj[key], prefix + key + ".", target);
-    } else {
-      const dotLocation = prefix + key;
-      target[dotLocation] = obj[key];
-      return target;
-    }
-  });
-  return target;
-};

src/scripts/settings.ts

@@ -28,13 +28,9 @@ const buildMigration = (
 export const settingsStore = new Store({
   defaults: {
     adBlock: false,
-    advanced: {
-      tidalUrl: "https://listen.tidal.com",
-    },
     api: true,
     apiSettings: {
       port: 47836,
-      hostname: "127.0.0.1",
     },
     customCSS: [],
     disableBackgroundThrottle: true,
@@ -43,7 +39,6 @@ export const settingsStore = new Store({
     enableDiscord: false,
     discord: {
       showSong: true,
-      showIdle: true,
       idleText: "Browsing Tidal",
       usingText: "Playing media on TIDAL",
       includeTimestamps: true,
@@ -106,19 +101,6 @@ export const settingsStore = new Store({
         },
       ]);
     },
-    "5.14.0": (migrationStore) => {
-      buildMigration("5.14.0", migrationStore, [
-        { 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" }]);
-    },
   },
 });
 
@@ -177,25 +159,3 @@ export const hideSettingsWindow = function () {
 export const closeSettingsWindow = function () {
   settingsWindow = null;
 };
-
-/**
- * add artists to the list of skipped artists
- * @param artists list of artists to append
- */
-export const addSkippedArtists = (artists: string[]) => {
-  const { skippedArtists } = settings;
-  const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
-  settingsStore.set(skippedArtists, Array.from(new Set([...previousStoreValue, ...artists])));
-};
-
-/**
- * Remove artists from the list of skipped artists
- * @param artists list of artists to remove
- */
-export const removeSkippedArtists = (artists: string[]) => {
-  const { skippedArtists } = settings;
-  const previousStoreValue = settingsStore.get<string, string[]>(skippedArtists);
-  const filteredArtists = previousStoreValue.filter((value) => ![...artists].includes(value));
-
-  settingsStore.set(skippedArtists, filteredArtists);
-};

tsconfig.json

@@ -8,7 +8,6 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "ts-dist",
-    "resolveJsonModule": true,
     "esModuleInterop": true,
     "baseUrl": ".",
     "paths": {