Merge 1610e3cc05 into 534547ce67

.stylelintrc.json

@@ -5,9 +5,6 @@
   "extends": [
     "stylelint-config-standard-scss"
   ],
-  "ignoreFiles": [
-    "src/themes/**.scss"
-  ],
   "rules": {
     "prettier/prettier": true,
     "scss/at-extend-no-missing-placeholder": null,

.vscode/settings.json

@@ -6,10 +6,8 @@
     "Flatpak",
     "geqnfr",
     "hifi",
-    "libnotify",
     "listenbrainz",
     "playpause",
-    "prs",
     "rescrobbler",
     "scrobble",
     "scrobbling",
@@ -18,9 +16,5 @@
     "tracklist",
     "widevine",
     "xesam"
-  ],
+  ]
-  "sonarlint.connectedMode.project": {
-    "connectionId": "public-sonarcloud",
-    "projectKey": "Mastermindzh_tidal-hifi"
-  }
 }

CHANGELOG.md

@@ -4,86 +4,11 @@ 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.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
-  - made the original API "legacy" (still works the same)
-  - Now using the correct HTTP verb for all new endpoints
-- Implemented TIDAL's universal links. All links are now universal.
-- Custom `tidal://` protocol fixed - By [TheRockYT](https://github.com/TheRockYT)
-- Global media shortcuts removed since TIDAL includes them by default - By [TheRockYT](https://github.com/TheRockYT)
-
-- Fixes
-  - [#390](https://github.com/Mastermindzh/tidal-hifi/issues/390)
-  - [#376](https://github.com/Mastermindzh/tidal-hifi/issues/376)
-  - [#383](https://github.com/Mastermindzh/tidal-hifi/issues/383)
-  - [#393](https://github.com/Mastermindzh/tidal-hifi/issues/393)
-
-## [5.10.0]
-
-- TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364)
-- Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365)
-- Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360)
-- Refactored "nowPlaying" code to always display the current state, even when the built-in UI is updated.
-  - fixes [#351](https://github.com/Mastermindzh/tidal-hifi/issues/351)
-  - fixes [#356](https://github.com/Mastermindzh/tidal-hifi/issues/356)
-  - fixes [#370](https://github.com/Mastermindzh/tidal-hifi/issues/370)
-- Reverted to using old icon syntax with icons in the build directory. fixes [#350](https://github.com/Mastermindzh/tidal-hifi/issues/350)
-- Enabled wayland platform flags by default when launching through .desktop file
-  - fixes [#273](https://github.com/Mastermindzh/tidal-hifi/issues/273)
-  - fixes [#347](https://github.com/Mastermindzh/tidal-hifi/issues/347)
-
-## [5.9.0]
-
-- More Discord options:
-  - Added the ability to hide the current song from the discord activity and display a custom text instead
-  - Added the ability to customize the text that is shown when no song is playing
-  - Discord now reacts to pausing/unpausing events
-- Refactored media info updates so it only updates the required info, fixes #342, #306
-- Added 5.9.0 logs/versions/migrations
-
-### Fixed
-
-- Fixed chromium mediaSession instance showing up. fixes #338 #198
-- Set a new icon, should fix #302
-- Made sure settingsWindow exists before operating on it. fixes #344
-
-## [5.8.0]
-
-- Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
-- Updated dependencies to latest
-  - added theme files to stylelint ignore
-  - fixed other stylelint errors
-
-- Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
-  - Added a hotkey to favorite ("Add to collection") songs: Control+a
-  - Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
-  - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`
-
-- Fixed wrong "end time stamp" for currently playing song (fixes [#282](https://github.com/Mastermindzh/tidal-hifi/issues/282))
-  - Affected the API + all integrations
-  - As requested we also added toggle to sync the timestamps to Discord (default = true)
-
-## [5.7.1]
-
-- Fixed mpris not being set up correctly due to capitalization of the instance name.
-
 ## [5.7.0]
 
 - Renamed app to TIDAL Hi-Fi.
 - Made sure all windows run with the same web preferences set (compared to main app).
   - Fixes the last.fm bug.
-- Added settings to customize the Discord rich presence information
-  - Discord settings are now also collapsible like the ListenBrainz ones are
-- Restyled settings menu to include version number and useful links on the about page
-    ![The new about page](./docs/images/new-about.png)
-- The ListenBrainz integration has been extended with a configurable (5 seconds by default) delay in song reporting so that it doesn't spam the API when you are cycling through songs.
-- Custom CSS now also applies to settings window
-    ![Tokyo Night theme on settings window](./docs/images/customcss-menu.png)
 
 ## [5.6.0]
 

README.md

@@ -1,8 +1,8 @@
-# TIDAL Hi-Fi (Max quality)<img src = "./build/icon.png" height="40" align="right"/>
+# TIDAL Hi-Fi (Max quality) <img src = "./build/icon.png" height="40" align="right"/>
 
 ![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg) [![github builds](https://github.com/mastermindzh/tidal-hifi/actions/workflows/build.yml/badge.svg)](https://github.com/Mastermindzh/tidal-hifi/actions) [![Build Status](https://ci.mastermindzh.tech/api/badges/Mastermindzh/tidal-hifi/status.svg)](https://ci.mastermindzh.tech/Mastermindzh/tidal-hifi) [![Discord logo](./docs/images/discord.png)](https://discord.gg/yhNwf4v4He)
 
-The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with Hi-Fi (High & Max) support thanks to widevine.
+The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi (High & Max) support thanks to widevine.
 
 ![TIDAL Hi-Fi preview](./docs/images/preview.png)
 
@@ -10,7 +10,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 
 <!-- toc -->
 
-- [TIDAL Hi-Fi (Max quality)](#tidal-hi-fi-max-quality)
+- [TIDAL Hi-Fi (Max quality)](#tidal-hi-fi-max-quality-)
   - [Table of Contents](#table-of-contents)
   - [Features](#features)
   - [Contributions](#contributions)
@@ -41,7 +41,6 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - Notifications
 - Custom [theming](./docs/theming.md)
 - 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 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))
@@ -51,11 +50,10 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
   - Songwhip.com integration (hotkey `ctrl + w`)
   - Discord RPC integration (showing "now listening", "Browsing", etc)
   - MPRIS integration
-- UI + Json config (`~/.config/tidal-hifi/`, or `~/.var/app/com.mastermindzh.tidal-hifi/` for Flatpak)
 
 ## Contributions
 
-To contribute you can use the standard GitHub features (issues, prs, etc.) or join the discord server to talk with like-minded individuals.
+To contribute you can use the standard GitHub features (issues, prs, etc) or join the discord server to talk with like-minded individuals.
 
 - ![Discord logo](./docs/images/discord.png) [Join the Discord server](https://discord.gg/yhNwf4v4He)
 
@@ -130,13 +128,10 @@ nix-env -iA nixpkgs.tidal-hifi
 
 To install and work with the code on this project follow these steps:
 
-- `git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)`
+- git clone [https://github.com/Mastermindzh/tidal-hifi.git](https://github.com/Mastermindzh/tidal-hifi.git)
-- `cd tidal-hifi`
+- cd TIDAL Hi-Fi
-- `npm install`
+- npm install
-- `npm run watch` to watch for auto-reload of Typescript/SCSS changes.
+- npm start
-  - `npm run compile` can be used to trigger it once
-- `npm watchStart` to auto watch for any updates files and reload Tidal Hi-Fi
-  - `npm start` can be used to run Tidal Hi-Fi manually once
 
 ## Integrations
 

build/electron-builder.base.yml

@@ -1,7 +1,7 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 28.1.1
+electronVersion: 24.1.2
 electronDownload:
-  version: 28.1.1+wvcus
+  version: 24.1.2+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
@@ -11,16 +11,10 @@ extraResources:
   - "themes/**"
 linux:
   category: AudioVideo
-  icon: build/icons
+  icon: assets/icons
   target:
     - dir
   executableName: tidal-hifi
-  executableArgs:
-    [
-      "--enable-features=UseOzonePlatform",
-      "--ozone-platform-hint=auto",
-      "--enable-features=WaylandWindowDecorations",
-    ]
   desktop:
     Encoding: UTF-8
     Name: TIDAL Hi-Fi

listen.tidal.com-parsing-scripts/verifyElements.js

@@ -16,12 +16,11 @@
     search: '[class^="searchField"]',
     shuffle: '*[data-test="shuffle"]',
     repeat: '*[data-test="repeat"]',
-    account: '*[class^="profileOptions"]',
+    account: '*[data-test^="profile-image-button"]',
-    settings: '*[data-test^="open-settings"]',
     media: '*[data-test="current-media-imagery"]',
     image: "img",
     current: '*[data-test="current-time"]',
-    duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+    duration: '*[data-test="duration"]',
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
@@ -30,7 +29,6 @@
     album_name_cell: '[class^="album"]',
     tracklist_row: '[data-test="tracklist-row"]',
     volume: '*[data-test="volume"]',
-    favorite: '*[data-test="footer-favorite-button"]',
   };
 
   let results = [];

package.json

@@ -1,13 +1,12 @@
 {
   "name": "tidal-hifi",
-  "version": "5.12.0",
+  "version": "5.6.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
     "start": "electron --inspect=0.0.0.0:5858 .",
     "watchStart": "nodemon dist -x \"npm run start\"",
     "compile": "tsc && npm run sass-and-copy",
-    "deps": "npm run watch",
     "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",
@@ -36,41 +35,41 @@
     "castlabs"
   ],
   "author": "Rick van Lieshout <info@rickvanlieshout.com> (http://rickvanlieshout.com)",
-  "homepage": "https://github.com/Mastermindzh/tidal-hifi",
+  "homepage": "https://github.com/Mastermindzh/TIDAL Hi-Fi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.1.2",
+    "@electron/remote": "^2.0.10",
-    "axios": "^1.6.8",
+    "axios": "^1.4.0",
     "discord-rpc": "^4.0.1",
-    "electron-store": "^8.2.0",
+    "electron-store": "^8.1.0",
-    "express": "^4.19.2",
+    "express": "^4.18.2",
-    "hotkeys-js": "^3.13.7",
+    "hotkeys-js": "^3.11.2",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.75.0"
+    "sass": "^1.64.1"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/discord-rpc": "^4.0.8",
+    "@types/discord-rpc": "^4.0.5",
-    "@types/express": "^4.17.21",
+    "@types/express": "^4.17.17",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.4.4",
-    "@types/request": "^2.48.12",
+    "@types/request": "^2.48.8",
-    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "@typescript-eslint/parser": "^6.18.0",
+    "@typescript-eslint/parser": "^6.1.0",
     "copyfiles": "^2.4.1",
-    "electron": "git+https://github.com/castlabs/electron-releases#v28.1.1+wvcus",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v24.1.2+wvcus",
-    "electron-builder": "^24.9.1",
+    "electron-builder": "^24.4.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.45.0",
     "js-yaml": "^4.1.0",
     "markdown-toc": "^1.2.0",
-    "nodemon": "^3.0.2",
+    "nodemon": "^3.0.1",
-    "prettier": "^3.1.1",
+    "prettier": "^3.0.0",
-    "stylelint": "^16.1.0",
+    "stylelint": "^15.10.2",
-    "stylelint-config-standard": "^36.0.0",
+    "stylelint-config-standard": "^34.0.0",
-    "stylelint-config-standard-scss": "^13.0.0",
+    "stylelint-config-standard-scss": "^10.0.0",
-    "stylelint-prettier": "^5.0.0",
+    "stylelint-prettier": "^4.0.0",
     "tsc-watch": "^6.0.4",
-    "typescript": "^5.3.3"
+    "typescript": "^5.1.6"
   },
   "prettier": "@mastermindzh/prettier-config"
-}
+}

scripts/resize-icons.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ "$1" != "" ]; then # check if arg 1 is present
-    FILE=$1
-else
-    echo "Please provide a file as an argument."
-    exit 1
-fi
-
-SIZES=("16x16" "22x22" "24x24" "32x32" "48x48" "64x64" "128x128" "256x256" "384x384")
-
-echo "Resizing $FILE..."
-
-for i in "${SIZES[@]}"; do
-    convert "$FILE" -resize "$i" "$i.png"
-done

src/constants/globalEvents.ts

@@ -12,7 +12,4 @@ export const globalEvents = {
   error: "error",
   whip: "whip",
   log: "log",
-  toggleFavorite: "toggleFavorite",
-  toggleShuffle: "toggleShuffle",
-  toggleRepeat: "toggleRepeat",
 };

src/constants/settings.ts

@@ -20,20 +20,11 @@ export const settings = {
   disableHardwareMediaKeys: "disableHardwareMediaKeys",
   enableCustomHotkeys: "enableCustomHotkeys",
   enableDiscord: "enableDiscord",
-  discord: {
-    detailsPrefix: "discord.detailsPrefix",
-    buttonText: "discord.buttonText",
-    includeTimestamps: "discord.includeTimestamps",
-    showSong: "discord.showSong",
-    idleText: "discord.idleText",
-    usingText: "discord.usingText",
-  },
   ListenBrainz: {
     root: "ListenBrainz",
     enabled: "ListenBrainz.enabled",
     api: "ListenBrainz.api",
     token: "ListenBrainz.token",
-    delay: "ListenBrainz.delay",
   },
   flags: {
     root: "flags",

src/features/api/features/current.ts

@@ -1,20 +0,0 @@
-import { Request, Response, Router } from "express";
-import fs from "fs";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-
-export const addCurrentInfo = (expressApp: Router) => {
-  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
-  expressApp.get("/current/image", getCurrentImage);
-};
-
-export const getCurrentImage = (req: Request, res: Response) => {
-  const stream = fs.createReadStream(mediaInfo.icon);
-  stream.on("open", function () {
-    res.set("Content-Type", "image/png");
-    stream.pipe(res);
-  });
-  stream.on("error", function () {
-    res.set("Content-Type", "text/plain");
-    res.status(404).end("Not found");
-  });
-};

src/features/api/features/player.ts

@@ -1,36 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { BrowserWindow } from "electron";
-import { Router } from "express";
-import { globalEvents } from "../../../constants/globalEvents";
-import { settings } from "../../../constants/settings";
-import { MediaStatus } from "../../../models/mediaStatus";
-import { mediaInfo } from "../../../scripts/mediaInfo";
-import { settingsStore } from "../../../scripts/settings";
-import { handleWindowEvent } from "../helpers/handleWindowEvent";
-
-export const addPlaybackControl = (expressApp: Router, mainWindow: BrowserWindow) => {
-  const windowEvent = handleWindowEvent(mainWindow);
-  const createRoute = (route: string) => `/player${route}`;
-
-  const createPlayerAction = (route: string, action: string) => {
-    expressApp.post(createRoute(route), (req, res) => windowEvent(res, action));
-  };
-
-  if (settingsStore.get(settings.playBackControl)) {
-    createPlayerAction("/play", globalEvents.play);
-    createPlayerAction("/favorite/toggle", globalEvents.toggleFavorite);
-    createPlayerAction("/pause", globalEvents.pause);
-    createPlayerAction("/next", globalEvents.next);
-    createPlayerAction("/previous", globalEvents.previous);
-    createPlayerAction("/shuffle/toggle", globalEvents.toggleShuffle);
-    createPlayerAction("/repeat/toggle", globalEvents.toggleRepeat);
-
-    expressApp.post(createRoute("/playpause"), (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        windowEvent(res, globalEvents.pause);
-      } else {
-        windowEvent(res, globalEvents.play);
-      }
-    });
-  }
-};

src/features/api/helpers/handleWindowEvent.ts

@@ -1,12 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Response } from "express";
-
-/**
- * Shorthand to handle a fire and forget global event
- * @param {*} res
- * @param {*} action
- */
-export const handleWindowEvent = (mainWindow: BrowserWindow) => (res: Response, action: string) => {
-  mainWindow.webContents.send("globalEvent", action);
-  res.sendStatus(200);
-};

src/features/api/index.ts

@@ -1,31 +0,0 @@
-import { BrowserWindow, dialog } from "electron";
-import express from "express";
-import { settings } from "../../constants/settings";
-import { settingsStore } from "../../scripts/settings";
-import { addCurrentInfo } from "./features/current";
-import { addPlaybackControl } from "./features/player";
-import { addLegacyApi } from "./legacy";
-
-/**
- * Function to enable TIDAL Hi-Fi's express api
- */
-export const startApi = (mainWindow: BrowserWindow) => {
-  const expressApp = express();
-  expressApp.get("/", (req, res) => res.send("Hello World!"));
-
-  // add features
-  addLegacyApi(expressApp, mainWindow);
-  addPlaybackControl(expressApp, mainWindow);
-  addCurrentInfo(expressApp);
-
-  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") {
-      message = `Port ${port} in use.`;
-    }
-
-    dialog.showErrorBox("Api failed to start.", message);
-  });
-};

src/features/api/legacy.ts

@@ -1,47 +0,0 @@
-import { BrowserWindow } from "electron";
-import { Response, Router } from "express";
-import { globalEvents } from "../../constants/globalEvents";
-import { settings } from "../../constants/settings";
-import { MediaStatus } from "../../models/mediaStatus";
-import { mediaInfo } from "../../scripts/mediaInfo";
-import { settingsStore } from "../../scripts/settings";
-import { getCurrentImage } from "./features/current";
-
-/**
- * The legacy API, this will not be maintained and probably has duplicate code :)
- * @param expressApp
- * @param mainWindow
- */
-export const addLegacyApi = (expressApp: Router, mainWindow: BrowserWindow) => {
-  expressApp.get("/image", getCurrentImage);
-
-  if (settingsStore.get(settings.playBackControl)) {
-    addLegacyControls();
-  }
-  function addLegacyControls() {
-    expressApp.get("/play", ({ res }) => handleGlobalEvent(res, globalEvents.play));
-    expressApp.post("/favorite/toggle", (req, res) =>
-      handleGlobalEvent(res, globalEvents.toggleFavorite)
-    );
-    expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
-    expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
-    expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
-    expressApp.get("/playpause", (req, res) => {
-      if (mediaInfo.status === MediaStatus.playing) {
-        handleGlobalEvent(res, globalEvents.pause);
-      } else {
-        handleGlobalEvent(res, globalEvents.play);
-      }
-    });
-  }
-
-  /**
-   * Shorthand to handle a fire and forget global event
-   * @param {*} res
-   * @param {*} action
-   */
-  function handleGlobalEvent(res: Response, action: string) {
-    mainWindow.webContents.send("globalEvent", action);
-    res.sendStatus(200);
-  }
-};

src/features/theming/theming.ts

@@ -1,31 +0,0 @@
-import fs from "fs";
-import { settings } from "../../constants/settings";
-import { settingsStore } from "../../scripts/settings";
-import { Logger } from "../logger";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function addCustomCss(app: any) {
-  window.addEventListener("DOMContentLoaded", () => {
-    const selectedTheme = settingsStore.get<string, string>(settings.theme);
-    if (selectedTheme !== "none") {
-      const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
-      const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
-      const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
-      fs.readFile(themeFile, "utf-8", (err, data) => {
-        if (err) {
-          Logger.alert("An error ocurred reading the theme file.", err, alert);
-          return;
-        }
-
-        const themeStyle = document.createElement("style");
-        themeStyle.innerHTML = data;
-        document.head.appendChild(themeStyle);
-      });
-    }
-
-    // read customCSS (it will override the theme)
-    const style = document.createElement("style");
-    style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
-    document.head.appendChild(style);
-  });
-}

src/features/time/parse.ts

@@ -1,14 +0,0 @@
-/**
- * Convert a HH:MM:SS string (or variants such as MM:SS or SS) to plain seconds
- * @param duration in HH:MM:SS format
- * @returns number of seconds in duration
- */
-export const convertDurationToSeconds = (duration: string) => {
-  return duration
-    .split(":")
-    .reverse()
-    .map((val) => Number(val))
-    .reduce((previous, current, index) => {
-      return index === 0 ? current : previous + current * Math.pow(60, index);
-    }, 0);
-};

src/main.ts

@@ -1,9 +1,17 @@
 import { enable, initialize } from "@electron/remote/main";
-import { BrowserWindow, app, components, ipcMain, session } from "electron";
+import {
+  app,
+  BrowserWindow,
+  components,
+  globalShortcut,
+  ipcMain,
+  protocol,
+  session,
+} from "electron";
 import path from "path";
 import { globalEvents } from "./constants/globalEvents";
+import { mediaKeys } from "./constants/mediaKeys";
 import { settings } from "./constants/settings";
-import { startApi } from "./features/api";
 import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
 import {
   acquireInhibitorIfInactive,
@@ -14,6 +22,7 @@ import { Songwhip } from "./features/songwhip/songwhip";
 import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
+import { startExpress } from "./scripts/express";
 import { updateMediaInfo } from "./scripts/mediaInfo";
 import { addMenu } from "./scripts/menu";
 import {
@@ -52,31 +61,20 @@ function syncMenuBarWithStore() {
 }
 
 /**
- * @returns true/false based on whether the current window is the main window
+ * Determine whether the current window is the main window
+ * if singleInstance is requested.
+ * If singleInstance isn't requested simply return true
+ * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
  */
-function isMainInstance() {
+function isMainInstanceOrMultipleInstancesAllowed() {
-  return app.requestSingleInstanceLock();
+  if (settingsStore.get(settings.singleInstance)) {
-}
+    const gotTheLock = app.requestSingleInstanceLock();
 
-/**
+    if (!gotTheLock) {
- * @returns true/false based on whether multiple instances are allowed
+      return false;
- */
+    }
-function isMultipleInstancesAllowed() {
-  return !settingsStore.get(settings.singleInstance);
-}
-
-/**
- * @param args the arguments passed to the app
- * @returns the custom protocol url if it exists, otherwise null
- */
-function getCustomProtocolUrl(args: string[]) {
-  const customProtocolArg = args.find((arg) => arg.startsWith(PROTOCOL_PREFIX));
-
-  if (!customProtocolArg) {
-    return null;
   }
-
+  return true;
-  return tidalUrl + "/" + customProtocolArg.substring(PROTOCOL_PREFIX.length + 3);
 }
 
 function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
@@ -100,16 +98,8 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   registerHttpProtocols();
   syncMenuBarWithStore();
 
-  // find the custom protocol argument
+  // load the Tidal website
-  const customProtocolUrl = getCustomProtocolUrl(process.argv);
+  mainWindow.loadURL(tidalUrl);
-
-  if (customProtocolUrl) {
-    // load the url received from the custom protocol
-    mainWindow.loadURL(customProtocolUrl);
-  } else {
-    // load the Tidal website
-    mainWindow.loadURL(tidalUrl);
-  }
 
   if (settingsStore.get(settings.disableBackgroundThrottle)) {
     // prevent setInterval lag
@@ -149,32 +139,27 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
 }
 
 function registerHttpProtocols() {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => {
+    mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
+  });
   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
     app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
   }
 }
 
+function addGlobalShortcuts() {
+  Object.keys(mediaKeys).forEach((key) => {
+    globalShortcut.register(`${key}`, () => {
+      mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`);
+    });
+  });
+}
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on("ready", async () => {
-  // check if the app is the main instance and multiple instances are not allowed
+  if (isMainInstanceOrMultipleInstancesAllowed()) {
-  if (isMainInstance() && !isMultipleInstancesAllowed()) {
-    app.on("second-instance", (_, commandLine) => {
-      const customProtocolUrl = getCustomProtocolUrl(commandLine);
-
-      if (customProtocolUrl) {
-        mainWindow.loadURL(customProtocolUrl);
-      }
-
-      if (mainWindow) {
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-      }
-    });
-  }
-
-  if (isMainInstance() || isMultipleInstancesAllowed()) {
     await components.whenReady();
 
     // Adblock
@@ -189,11 +174,12 @@ app.on("ready", async () => {
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();
+    addGlobalShortcuts();
     if (settingsStore.get(settings.trayIcon)) {
       addTray(mainWindow, { icon });
       refreshTray(mainWindow);
     }
-    settingsStore.get(settings.api) && startApi(mainWindow);
+    settingsStore.get(settings.api) && startExpress(mainWindow);
     settingsStore.get(settings.enableDiscord) && initRPC();
   } else {
     app.quit();

src/models/mediaInfo.ts

@@ -1,5 +1,4 @@
 import { MediaStatus } from "./mediaStatus";
-import { MediaPlayerInfo } from "./mediaPlayerInfo";
 
 export interface MediaInfo {
   title: string;
@@ -9,10 +8,6 @@ export interface MediaInfo {
   status: MediaStatus;
   url: 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

@@ -5,11 +5,8 @@ export interface Options {
   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

@@ -4,29 +4,9 @@ import fs from "fs";
 import { globalEvents } from "../../constants/globalEvents";
 import { settings } from "../../constants/settings";
 import { Logger } from "../../features/logger";
-import { addCustomCss } from "../../features/theming/theming";
 import { settingsStore } from "./../../scripts/settings";
 import { getOptions, getOptionsHeader, getThemeListFromDirectory } from "./theming";
 
-// All switches on the settings screen that show additional options based on their state
-const switchesWithSettings = {
-  listenBrainz: {
-    switch: "enableListenBrainz",
-    classToHide: "listenbrainz__options",
-    settingsKey: settings.ListenBrainz.enabled,
-  },
-  discord: {
-    switch: "enableDiscord",
-    classToHide: "discord_options",
-    settingsKey: settings.enableDiscord,
-  },
-  discord_show_song: {
-    switch: "discord_show_song",
-    classToHide: "discord_show_song_options",
-    settingsKey: settings.discord.showSong,
-  }
-};
-
 let adBlock: HTMLInputElement,
   api: HTMLInputElement,
   customCSS: HTMLInputElement,
@@ -50,16 +30,7 @@ let adBlock: HTMLInputElement,
   enableListenBrainz: HTMLInputElement,
   ListenBrainzAPI: HTMLInputElement,
   ListenBrainzToken: HTMLInputElement,
-  listenbrainz_delay: HTMLInputElement,
+  enableWaylandSupport: HTMLInputElement;
-  enableWaylandSupport: HTMLInputElement,
-  discord_details_prefix: HTMLInputElement,
-  discord_include_timestamps: HTMLInputElement,
-  discord_button_text: HTMLInputElement,
-  discord_show_song: HTMLInputElement,
-  discord_idle_text: HTMLInputElement,
-  discord_using_text: HTMLInputElement;
-
-addCustomCss(app);
 
 function getThemeFiles() {
   const selectElement = document.getElementById("themesList") as HTMLSelectElement;
@@ -88,7 +59,6 @@ function handleFileUploads() {
   const fileMessage = document.getElementById("file-message");
   fileMessage.innerText = "or drag and drop files here";
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   document.getElementById("theme-files").addEventListener("change", function (e: any) {
     Array.from(e.target.files).forEach((file: File) => {
       const destination = `${app.getPath("userData")}/themes/${file.name}`;
@@ -99,20 +69,6 @@ function handleFileUploads() {
   });
 }
 
-/**
- * hide or unhide an element
- * @param checked
- * @param toggleOptions
- */
-function setElementHidden(
-  checked: boolean,
-  toggleOptions: { switch: string; classToHide: string }
-) {
-  const element = document.getElementById(toggleOptions.classToHide);
-
-  checked ? element.classList.remove("hidden") : element.classList.add("hidden");
-}
-
 /**
  * Sync the UI forms with the current settings
  */
@@ -142,18 +98,6 @@ function refreshSettings() {
     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
     ListenBrainzAPI.value = settingsStore.get(settings.ListenBrainz.api);
     ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
-    listenbrainz_delay.value = settingsStore.get(settings.ListenBrainz.delay);
-    discord_details_prefix.value = settingsStore.get(settings.discord.detailsPrefix);
-    discord_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_idle_text.value = settingsStore.get(settings.discord.idleText);
-    discord_using_text.value = settingsStore.get(settings.discord.usingText);
-
-    // set state of all switches with additional settings
-    Object.values(switchesWithSettings).forEach((settingSwitch) => {
-      setElementHidden(settingsStore.get(settingSwitch.settingsKey), settingSwitch);
-    });
   } catch (error) {
     Logger.log("Refreshing settings failed.", error);
   }
@@ -173,6 +117,14 @@ function hide() {
   ipcRenderer.send(globalEvents.hideSettings);
 }
 
+/**
+ * Restart TIDAL Hi-Fi after changes
+ */
+function restart() {
+  app.relaunch();
+  app.exit();
+}
+
 /**
  * Bind UI components to functions after DOMContentLoaded
  */
@@ -185,28 +137,25 @@ window.addEventListener("DOMContentLoaded", () => {
   handleFileUploads();
 
   document.getElementById("close").addEventListener("click", hide);
+  document.getElementById("restart").addEventListener("click", restart);
   document.querySelectorAll(".external-link").forEach((elem) =>
     elem.addEventListener("click", function (event) {
       openExternal((event.target as HTMLElement).getAttribute("data-url"));
     })
   );
 
-  function addInputListener(
+  function addInputListener(source: HTMLInputElement, key: string) {
-    source: HTMLInputElement,
-    key: string,
-    toggleOptions?: { switch: string; classToHide: string }
-  ) {
     source.addEventListener("input", () => {
       if (source.value === "on") {
         settingsStore.set(key, source.checked);
       } else {
         settingsStore.set(key, source.value);
       }
-
+      // Live update the view for ListenBrainz input, hide if disabled/show if enabled
-      if (toggleOptions) {
+      if (source.value === "on" && source.id === "enableListenBrainz") {
-        if (source.value === "on" && source.id === toggleOptions.switch) {
+        source.checked
-          setElementHidden(source.checked, toggleOptions);
+          ? document.getElementById("listenbrainz__options").removeAttribute("hidden")
-        }
+          : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
       }
       ipcRenderer.send(globalEvents.storeChanged);
     });
@@ -258,22 +207,19 @@ window.addEventListener("DOMContentLoaded", () => {
   enableListenBrainz = get("enableListenBrainz");
   ListenBrainzAPI = get("ListenBrainzAPI");
   ListenBrainzToken = get("ListenBrainzToken");
-  discord_details_prefix = get("discord_details_prefix");
-  discord_include_timestamps = get("discord_include_timestamps");
-  listenbrainz_delay = get("listenbrainz_delay");
-  discord_button_text = get("discord_button_text");
-  discord_show_song = get("discord_show_song");
-  discord_using_text = get("discord_using_text");
-  discord_idle_text = get("discord_idle_text")
 
   refreshSettings();
+  enableListenBrainz.checked
+    ? document.getElementById("listenbrainz__options").removeAttribute("hidden")
+    : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
+
   addInputListener(adBlock, settings.adBlock);
   addInputListener(api, settings.api);
   addTextAreaListener(customCSS, settings.customCSS);
   addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
   addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
   addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
-  addInputListener(enableDiscord, settings.enableDiscord, switchesWithSettings.discord);
+  addInputListener(enableDiscord, settings.enableDiscord);
   addInputListener(enableWaylandSupport, settings.flags.enableWaylandSupport);
   addInputListener(gpuRasterization, settings.flags.gpuRasterization);
   addInputListener(menuBar, settings.menuBar);
@@ -288,18 +234,7 @@ window.addEventListener("DOMContentLoaded", () => {
   addSelectListener(theme, settings.theme);
   addInputListener(trayIcon, settings.trayIcon);
   addInputListener(updateFrequency, settings.updateFrequency);
-  addInputListener(
+  addInputListener(enableListenBrainz, settings.ListenBrainz.enabled);
-    enableListenBrainz,
+  addTextAreaListener(ListenBrainzAPI, settings.ListenBrainz.api);
-    settings.ListenBrainz.enabled,
+  addTextAreaListener(ListenBrainzToken, settings.ListenBrainz.token);
-    switchesWithSettings.listenBrainz
-  );
-  addInputListener(ListenBrainzAPI, settings.ListenBrainz.api);
-  addInputListener(ListenBrainzToken, settings.ListenBrainz.token);
-  addInputListener(listenbrainz_delay, settings.ListenBrainz.delay);
-  addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
-  addInputListener(discord_include_timestamps, settings.discord.includeTimestamps);
-  addInputListener(discord_button_text, settings.discord.buttonText);
-  addInputListener(discord_show_song, settings.discord.showSong, switchesWithSettings.discord_show_song);
-  addInputListener(discord_idle_text, settings.discord.idleText);
-  addInputListener(discord_using_text, settings.discord.usingText);
 });

src/pages/settings/settings.html

@@ -7,7 +7,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <link rel="stylesheet" href="./settings.css" />
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 </head>
 
 <body class="settings-window">
@@ -202,9 +201,6 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-          </div>
-          <div class="group">
-            <p class="group__title">Discord</p>
             <div class="group__option">
               <div class="group__description">
                 <h4>Discord RPC</h4>
@@ -215,66 +211,6 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-            <div id="discord_options">
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Idle Text</h4>
-                  <p>The text displayed on Discord's rich presence while idling in the app.</p>
-                  <input id="discord_idle_text" type="text" class="text-input" name="discord_idle_text" />
-                </div>
-              </div>
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Using Tidal Text</h4>
-                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
-                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
-                </div>
-              </div>
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Show song</h4>
-                  <p>Show the current song in the Discord client</p>
-                </div>
-                <label class="switch">
-                  <input id="discord_show_song" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-
-              <div id="discord_show_song_options" class="hidden">
-
-                <div class="group__option" class="hidden">
-                  <div class="group__description">
-                    <h4>Include timestamps</h4>
-                    <p>Show current/end playtime in the Discord client</p>
-                  </div>
-                  <label class="switch">
-                    <input id="discord_include_timestamps" type="checkbox" />
-                    <span class="switch__slider"></span>
-                  </label>
-                </div>
-
-                <div class="group__option" class="hidden">
-                  <div class="group__description">
-                    <h4>Details prefix</h4>
-                    <p>Prefix for the "details" field of Discord's rich presence.</p>
-                    <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
-                  </div>
-                </div>
-
-                <div class="group__option">
-                  <div class="group__description">
-                    <h4>Button text</h4>
-                    <p>Text to display on the button below the song information.</p>
-                    <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
-                  </div>
-                </div>
-              </div>
-
-            </div>
           </div>
           <div class="group">
             <p class="group__title">ListenBrainz</p>
@@ -288,27 +224,21 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-            <div id="listenbrainz__options" class="hidden">
+            <div id="listenbrainz__options" hidden="true">
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz API Url</h4>
                   <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
-                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
                 </div>
               </div>
+              <textarea id="ListenBrainzAPI" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz User Token</h4>
                   <p>Provide the user token you can get from the settings page.</p>
-                  <input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
                 </div>
               </div>
-            </div>
+              <textarea id="ListenBrainzToken" class="textarea" cols="1" rows="1" spellcheck="false"></textarea>
-            <div class="group__description">
-              <h4>ScrobbleDelay</h4>
-              <p>The delay (in ms) to send a song to ListenBrainz. Prevents spamming the API when you fast forward
-                immediately</p>
-              <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
             </div>
           </div>
         </section>
@@ -430,26 +360,21 @@
 
         <section id="about-section" class="tabs__section about-section">
           <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
-          <h4>TIDAL Hi-Fi</h4>
+          <p class="about-section__text">
-          <div class="about-section__version">
+            <a class="external-link" data-url="https://github.com/Mastermindzh/tidal-hifi">TIDAL Hi-Fi</a>
-            <a target="_blank" rel="noopener"
+            is made by
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.12.0">5.12.0</a>
+            <a class="external-link" data-url="https://www.rickvanlieshout.com">
-          </div>
+              Rick van Lieshout</a>. <br />It uses
-          <div class="about-section__links">
+            <a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
-            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
+            version of Electron for widevine support.
-              class="about-section__button">Github
+          </p>
-              <i class="fa fa-external-link"></i></a>
-            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/issues"
-              class="about-section__button">Report an issue <i class="fa fa-external-link"></i></a>
-            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
-              class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
-          </div>
         </section>
 
         <footer class="footer">
           <p class="footer__note">
-            <strong>Note</strong>: some settings may require a restart of TIDAL Hi-Fi.
+            Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
           </p>
+          <button class="footer__button" id="restart">Restart TIDAL Hi-Fi</button>
         </footer>
       </div>
     </main>

src/pages/settings/settings.scss

@@ -8,7 +8,6 @@ $tidal-grey: #72777f;
 $tidal-grey-darker: #404248;
 $tidal-grey-darker-focus: #55585f;
 $tidal-grey-darkest: #242528;
-$tidal-grey-darkest-focus: #2e2f33;
 
 // --- Fonts ---
 
@@ -310,79 +309,26 @@ html {
 }
 
 .about-section {
-  padding-top: 40px;
+  padding-top: 120px;
   text-align: center;
 
   &__icon {
     display: inline-block;
-    width: 200px;
+    width: 100px;
   }
 
   &__text {
     display: block;
-    max-width: 500px;
+    max-width: 350px;
-    margin: -15px auto 0;
+    margin: 20px auto 0;
   }
 
-  &__table {
+  // --- Footer ---
-    width: 120px;
-    margin: 0 auto;
-
-    td {
-      text-align: left;
-    }
-  }
-
-  &__version {
-    margin: -10px 0 30px;
-
-    a {
-      background-color: $tidal-grey-darker;
-      border: none;
-      color: $tidal-blue;
-      padding: 8px 20px;
-      font-weight: bold;
-      text-align: center;
-      text-decoration: none;
-      display: inline-block;
-      border-radius: 100px;
-    }
-  }
-
-  &__links {
-    width: 300px;
-    margin: 0 auto;
-
-    a {
-      border-radius: 10px;
-      border: none;
-      color: $white;
-      padding: 10px 10px 10px 20px;
-      margin: 8px;
-      text-align: left;
-      font-size: 16px;
-      line-height: 30px;
-      display: flex;
-      text-decoration: none;
-      justify-content: space-between;
-      background-color: $tidal-grey-darkest;
-
-      i {
-        color: $white;
-        line-height: 30px;
-        font-size: 18px;
-      }
-
-      &:hover {
-        background-color: $tidal-grey-darkest-focus;
-      }
-    }
-  }
 }
 
-// --- Footer ---
 .footer {
   position: sticky;
+  top: calc(100% - 120px);
   height: 100px;
   padding-top: 20px;
   text-align: center;
@@ -415,17 +361,17 @@ html {
 }
 
 // file upload
+
 .file-drop-area {
   position: relative;
   display: flex;
   align-items: center;
   width: 100%;
   max-width: 100%;
-  padding: 25px 0;
+  padding: 25px 0 25px 0px;
   border: 1px dashed $tidal-grey;
   border-radius: 3px;
   transition: 0.2s;
-
   &.is-active {
     background-color: $black;
   }
@@ -463,7 +409,6 @@ html {
   width: 100%;
   cursor: pointer;
   opacity: 0;
-
   &:focus {
     outline: none;
   }
@@ -498,7 +443,3 @@ html {
     }
   }
 }
-
-.hidden {
-  display: none !important;
-}

src/preload.ts

@@ -1,5 +1,6 @@
 import { app, dialog, Notification } from "@electron/remote";
 import { clipboard, ipcRenderer } from "electron";
+import fs from "fs";
 import Player from "mpris-service";
 import { globalEvents } from "./constants/globalEvents";
 import { settings } from "./constants/settings";
@@ -11,29 +12,18 @@ import {
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
 import { Songwhip } from "./features/songwhip/songwhip";
-import { addCustomCss } from "./features/theming/theming";
-import { convertDurationToSeconds } from "./features/time/parse";
 import { MediaStatus } from "./models/mediaStatus";
 import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
 import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
-import { RepeatState } from "./models/repeatState";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 const appName = "TIDAL Hi-Fi";
 let currentSong = "";
 let player: Player;
 let currentPlayStatus = MediaStatus.paused;
-let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
-let scrobbleWaitingForDelay = false;
-
-let currentlyPlaying = MediaStatus.paused;
-let currentRepeatState: RepeatState = RepeatState.off;
-let currentShuffleState = false;
-let currentMediaInfo: Options;
-let currentNotification: Electron.Notification;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -53,7 +43,7 @@ const elements = {
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
-  duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
+  duration: '*[data-test="duration"]',
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
   mediaItem: "[data-type='mediaItem']",
@@ -62,7 +52,6 @@ const elements = {
   album_name_cell: '[class^="album"]',
   tracklist_row: '[data-test="tracklist-row"]',
   volume: '*[data-test="volume"]',
-  favorite: '*[data-test="footer-favorite-button"]',
   /**
    * Get an element from the dom
    * @param {*} key key in elements object to fetch
@@ -140,10 +129,6 @@ const elements = {
     return this.get("volume").getAttribute("aria-checked") === "false"; // it's muted if aria-checked is false
   },
 
-  isFavorite: function () {
-    return this.get("favorite").getAttribute("aria-checked") === "true";
-  },
-
   /**
    * Shorthand function to get the text of a dom element
    * @param {*} key key in elements object to fetch
@@ -171,6 +156,32 @@ const elements = {
   },
 };
 
+function addCustomCss() {
+  window.addEventListener("DOMContentLoaded", () => {
+    const selectedTheme = settingsStore.get<string, string>(settings.theme);
+    if (selectedTheme !== "none") {
+      const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
+      const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
+      const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
+      fs.readFile(themeFile, "utf-8", (err, data) => {
+        if (err) {
+          Logger.alert("An error ocurred reading the theme file.", err, alert);
+          return;
+        }
+
+        const themeStyle = document.createElement("style");
+        themeStyle.innerHTML = data;
+        document.head.appendChild(themeStyle);
+      });
+    }
+
+    // read customCSS (it will override the theme)
+    const style = document.createElement("style");
+    style.innerHTML = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
+    document.head.appendChild(style);
+  });
+}
+
 /**
  * Get the update frequency from the store
  * make sure it returns a number, if not use the default
@@ -221,10 +232,6 @@ function addHotKeys() {
       handleLogout();
     });
 
-    addHotkey("Control+a", function () {
-      elements.click("favorite");
-    });
-
     addHotkey("Control+h", function () {
       elements.click("home");
     });
@@ -309,8 +316,6 @@ function addIPCEventListeners() {
     ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
-        case globalEvents.play:
-        case globalEvents.pause:
           playPause();
           break;
         case globalEvents.next:
@@ -319,14 +324,11 @@ function addIPCEventListeners() {
         case globalEvents.previous:
           elements.click("previous");
           break;
-        case globalEvents.toggleFavorite:
+        case globalEvents.play:
-          elements.click("favorite");
+          elements.click("play");
           break;
-        case globalEvents.toggleShuffle:
+        case globalEvents.pause:
-          elements.click("shuffle");
+          elements.click("pause");
-          break;
-        case globalEvents.toggleRepeat:
-          elements.click("repeat");
           break;
         default:
           break;
@@ -351,23 +353,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
@@ -384,76 +369,15 @@ function convertDuration(duration: string) {
  */
 function updateMediaInfo(options: Options, notify: boolean) {
   if (options) {
-    currentMediaInfo = options;
     ipcRenderer.send(globalEvents.updateInfo, options);
     if (settingsStore.get(settings.notifications) && notify) {
-      if (currentNotification) currentNotification.close();
+      new Notification({ title: options.title, body: options.artists, icon: options.icon }).show();
-      currentNotification = new Notification({
-        title: options.title,
-        body: options.artists,
-        icon: options.icon,
-      });
-      currentNotification.show();
     }
     updateMpris(options);
     updateListenBrainz(options);
   }
 }
 
-function addMPRIS() {
-  if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
-    try {
-      player = Player({
-        name: "tidal-hifi",
-        identity: "tidal-hifi",
-        supportedUriSchemes: ["file"],
-        supportedMimeTypes: [
-          "audio/mpeg",
-          "audio/flac",
-          "audio/x-flac",
-          "application/ogg",
-          "audio/wav",
-        ],
-        supportedInterfaces: ["player"],
-        desktopEntry: "tidal-hifi",
-      });
-      // Events
-      const events = {
-        next: "next",
-        previous: "previous",
-        pause: "pause",
-        playpause: "playpause",
-        stop: "stop",
-        play: "play",
-        loopStatus: "repeat",
-        shuffle: "shuffle",
-        seek: "seek",
-      } as { [key: string]: string };
-      Object.keys(events).forEach(function (eventName) {
-        player.on(eventName, function () {
-          const eventValue = events[eventName];
-          switch (events[eventValue]) {
-            case events.playpause:
-              playPause();
-              break;
-            default:
-              elements.click(eventValue);
-          }
-        });
-      });
-      // Override get position function
-      player.getPosition = function () {
-        return convertDuration(elements.getText("current")) * 1000 * 1000;
-      };
-      player.on("quit", function () {
-        app.quit();
-      });
-    } catch (exception) {
-      Logger.log("MPRIS player api not working", exception);
-    }
-  }
-}
-
 function updateMpris(options: Options) {
   if (player) {
     player.metadata = {
@@ -471,9 +395,6 @@ function updateMpris(options: Options) {
   }
 }
 
-/**
- * Update the listenbrainz service with new data based on a few conditions
- */
 function updateListenBrainz(options: Options) {
   if (settingsStore.get(settings.ListenBrainz.enabled)) {
     const oldData = ListenBrainzStore.get(ListenBrainzConstants.oldData) as StoreData;
@@ -481,22 +402,12 @@ function updateListenBrainz(options: Options) {
       (!oldData && options.status === MediaStatus.playing) ||
       (oldData && oldData.title !== options.title)
     ) {
-      if (!scrobbleWaitingForDelay) {
+      ListenBrainz.scrobble(
-        scrobbleWaitingForDelay = true;
+        options.title,
-        clearTimeout(currentListenBrainzDelayId);
+        options.artists,
-        currentListenBrainzDelayId = setTimeout(
+        options.status,
-          () => {
+        convertDuration(options.duration)
-            ListenBrainz.scrobble(
+      );
-              options.title,
-              options.artists,
-              options.status,
-              convertDuration(options.duration)
-            );
-            scrobbleWaitingForDelay = false;
-          },
-          settingsStore.get(settings.ListenBrainz.delay) ?? 0
-        );
-      }
     }
   }
 }
@@ -520,6 +431,23 @@ function getTrackID() {
   return window.location;
 }
 
+function updateMediaSession(options: Options) {
+  if ("mediaSession" in navigator) {
+    navigator.mediaSession.metadata = new MediaMetadata({
+      title: options.title,
+      artist: options.artists,
+      album: options.album,
+      artwork: [
+        {
+          src: options.icon,
+          sizes: "640x640",
+          type: "image/png",
+        },
+      ],
+    });
+  }
+}
+
 /**
  * Watch for song changes and update title + notify
  */
@@ -527,86 +455,59 @@ setInterval(function () {
   const title = elements.getText("title");
   const artistsArray = elements.getArtistsArray();
   const artistsString = elements.getArtistsString(artistsArray);
-  const songDashArtistTitle = `${title} - ${artistsString}`;
+  skipArtistsIfFoundInSkippedArtistsList(artistsArray);
-  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
+
+  const album = elements.getAlbumName();
   const current = elements.getText("current");
+  const duration = elements.getText("duration");
+  const songDashArtistTitle = `${title} - ${artistsString}`;
   const currentStatus = getCurrentlyPlayingStatus();
-  const shuffleState = getCurrentShuffleState();
+  const options = {
-  const repeatState = getCurrentRepeatState();
+    title,
+    artists: artistsString,
+    album: album,
+    status: currentStatus,
+    url: getTrackURL(),
+    current,
+    duration,
+    "app-name": appName,
+    image: "",
+    icon: "",
+  };
 
-  const playStateChanged = currentStatus != currentlyPlaying;
+  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
-  const shuffleStateChanged = shuffleState != currentShuffleState;
-  const repeatStateChanged = repeatState != currentRepeatState;
 
-  const hasStateChanged = playStateChanged || shuffleStateChanged || repeatStateChanged;
+  // update title, url and play info with new info
+  setTitle(songDashArtistTitle);
+  getTrackURL();
+  currentSong = songDashArtistTitle;
+  currentPlayStatus = currentStatus;
 
-  // update info if song changed or was just paused/resumed
+  const image = elements.getSongIcon();
-  if (titleOrArtistsChanged || hasStateChanged) {
-    if (playStateChanged) currentlyPlaying = currentStatus;
-    if (shuffleStateChanged) currentShuffleState = shuffleState;
-    if (repeatStateChanged) currentRepeatState = repeatState;
 
-    skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+  new Promise<void>((resolve) => {
-
+    if (image.startsWith("http")) {
-    const album = elements.getAlbumName();
+      options.image = image;
-    const duration = elements.getText("duration");
+      downloadFile(image, notificationPath).then(
-    const options = {
+        () => {
-      title,
+          options.icon = notificationPath;
-      artists: artistsString,
+          resolve();
-      album: album,
+        },
-      status: currentStatus,
+        () => {
-      url: getTrackURL(),
+          // if the image can't be downloaded then continue without it
-      current,
+          resolve();
-      currentInSeconds: convertDurationToSeconds(current),
+        }
-      duration,
+      );
-      durationInSeconds: convertDurationToSeconds(duration),
+    } else {
-      "app-name": appName,
+      // if the image can't be found on the page continue without it
-      image: "",
+      resolve();
-      icon: "",
+    }
-      favorite: elements.isFavorite(),
+  }).then(() => {
-
+    updateMediaInfo(options, titleOrArtistsChanged);
-      player: {
+    if (titleOrArtistsChanged) {
-        status: currentStatus,
+      updateMediaSession(options);
-        shuffle: shuffleState,
+    }
-        repeat: repeatState,
+  });
-      },
-    };
-
-    // update title, url and play info with new info
-    setTitle(songDashArtistTitle);
-    getTrackURL();
-    currentSong = songDashArtistTitle;
-    currentPlayStatus = currentStatus;
-
-    const image = elements.getSongIcon();
-
-    new Promise<void>((resolve) => {
-      if (image.startsWith("http")) {
-        options.image = image;
-        downloadFile(image, notificationPath).then(
-          () => {
-            options.icon = notificationPath;
-            resolve();
-          },
-          () => {
-            // if the image can't be downloaded then continue without it
-            resolve();
-          }
-        );
-      } else {
-        // if the image can't be found on the page continue without it
-        resolve();
-      }
-    }).then(() => {
-      updateMediaInfo(options, titleOrArtistsChanged);
-    });
-  } else {
-    // just update the time
-    updateMediaInfo(
-      { ...currentMediaInfo, ...{ current, currentInSeconds: convertDurationToSeconds(current) } },
-      false
-    );
-  }
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip
@@ -627,8 +528,60 @@ setInterval(function () {
   }
 }, getUpdateFrequency());
 
-addMPRIS();
+if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
-addCustomCss(app);
+  try {
+    player = Player({
+      name: "TIDAL Hi-Fi",
+      identity: "TIDAL Hi-Fi",
+      supportedUriSchemes: ["file"],
+      supportedMimeTypes: [
+        "audio/mpeg",
+        "audio/flac",
+        "audio/x-flac",
+        "application/ogg",
+        "audio/wav",
+      ],
+      supportedInterfaces: ["player"],
+      desktopEntry: "tidal-hifi",
+    });
+    // Events
+    const events = {
+      next: "next",
+      previous: "previous",
+      pause: "pause",
+      playpause: "playpause",
+      stop: "stop",
+      play: "play",
+      loopStatus: "repeat",
+      shuffle: "shuffle",
+      seek: "seek",
+    } as { [key: string]: string };
+    Object.keys(events).forEach(function (eventName) {
+      player.on(eventName, function () {
+        const eventValue = events[eventName];
+        switch (events[eventValue]) {
+          case events.playpause:
+            playPause();
+            break;
+
+          default:
+            elements.click(eventValue);
+        }
+      });
+    });
+    // Override get position function
+    player.getPosition = function () {
+      return convertDuration(elements.getText("current")) * 1000 * 1000;
+    };
+
+    player.on("quit", function () {
+      app.quit();
+    });
+  } catch (exception) {
+    console.log("player api not working");
+  }
+}
+addCustomCss();
 addHotKeys();
 addIPCEventListeners();
 addFullScreenListeners();

src/scripts/discord.ts

@@ -1,87 +1,62 @@
-import { Client, Presence } from "discord-rpc";
+import { Client } from "discord-rpc";
 import { app, ipcMain } from "electron";
 import { globalEvents } from "../constants/globalEvents";
-import { settings } from "../constants/settings";
-import { Logger } from "../features/logger";
-import { convertDurationToSeconds } from "../features/time/parse";
 import { MediaStatus } from "../models/mediaStatus";
 import { mediaInfo } from "./mediaInfo";
-import { settingsStore } from "./settings";
 
 const clientId = "833617820704440341";
 
+function timeToSeconds(timeArray: string[]) {
+  const minutes = parseInt(timeArray[0]) * 1;
+  const seconds = minutes * 60 + parseInt(timeArray[1]) * 1;
+  return seconds;
+}
+
 export let rpc: Client;
 
 const observer = () => {
-  if (rpc) {
+  if (mediaInfo.status == MediaStatus.paused && rpc) {
-    rpc.setActivity(getActivity());
+    rpc.setActivity(idleStatus);
+  } else if (rpc) {
+    const currentSeconds = timeToSeconds(mediaInfo.current.split(":"));
+    const durationSeconds = timeToSeconds(mediaInfo.duration.split(":"));
+    const date = new Date();
+    const now = (date.getTime() / 1000) | 0;
+    const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+    if (mediaInfo.url) {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Listening to ${mediaInfo.title}`,
+          state: mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)",
+          startTimestamp: now,
+          endTimestamp: remaining,
+          largeImageKey: mediaInfo.image,
+          largeImageText: mediaInfo.album ? mediaInfo.album : `${idleStatus.largeImageText}`,
+          buttons: [{ label: "Play on Tidal", url: mediaInfo.url }],
+        },
+      });
+    } else {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Watching ${mediaInfo.title}`,
+          state: mediaInfo.artists,
+          startTimestamp: now,
+          endTimestamp: remaining,
+        },
+      });
+    }
   }
 };
 
-const defaultPresence = {
+const idleStatus = {
+  details: `Browsing Tidal`,
   largeImageKey: "tidal-hifi-icon",
   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
 };
 
-const getActivity = (): Presence => {
-  const presence: Presence = { ...defaultPresence };
-
-  if (mediaInfo.status === MediaStatus.paused) {
-    presence.details =
-      settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
-  } else {
-    const showSong = settingsStore.get<string, boolean>(settings.discord.showSong) ?? false;
-    if (showSong) {
-      const { includeTimestamps, detailsPrefix, buttonText } = getFromStore();
-      includeTimeStamps(includeTimestamps);
-      setPresenceFromMediaInfo(detailsPrefix, buttonText);
-    } else {
-      presence.details =
-        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
-    }
-  }
-  return presence;
-
-  function getFromStore() {
-    const includeTimestamps =
-      settingsStore.get<string, boolean>(settings.discord.includeTimestamps) ?? true;
-    const detailsPrefix =
-      settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
-    const buttonText =
-      settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
-
-    return { includeTimestamps, detailsPrefix, buttonText };
-  }
-
-  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
-    if (mediaInfo.url) {
-      presence.details = `${detailsPrefix}${mediaInfo.title}`;
-      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
-      presence.largeImageKey = mediaInfo.image;
-      if (mediaInfo.album) {
-        presence.largeImageText = mediaInfo.album;
-      }
-      presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
-    } else {
-      presence.details = `Watching ${mediaInfo.title}`;
-      presence.state = mediaInfo.artists;
-    }
-  }
-
-  function includeTimeStamps(includeTimestamps: boolean) {
-    if (includeTimestamps) {
-      const currentSeconds = convertDurationToSeconds(mediaInfo.current);
-      const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const date = new Date();
-      const now = (date.getTime() / 1000) | 0;
-      const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
-      presence.startTimestamp = now;
-      presence.endTimestamp = remaining;
-    }
-  }
-};
-
 /**
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
@@ -90,12 +65,12 @@ export const initRPC = () => {
   rpc.login({ clientId }).then(
     () => {
       rpc.on("ready", () => {
-        rpc.setActivity(getActivity());
+        rpc.setActivity(idleStatus);
       });
       ipcMain.on(globalEvents.updateInfo, observer);
     },
     () => {
-      Logger.log("Can't connect to Discord, is it running?");
+      console.error("Can't connect to Discord, is it running?");
     }
   );
 };

src/scripts/express.ts

@@ -0,0 +1,66 @@
+import { BrowserWindow, dialog } from "electron";
+import express, { Response } from "express";
+import fs from "fs";
+import { settings } from "../constants/settings";
+import { MediaStatus } from "../models/mediaStatus";
+import { globalEvents } from "./../constants/globalEvents";
+import { mediaInfo } from "./mediaInfo";
+import { settingsStore } from "./settings";
+
+/**
+ * Function to enable TIDAL Hi-Fi's express api
+ */
+
+// expressModule.run = function (mainWindow)
+export const startExpress = (mainWindow: BrowserWindow) => {
+  /**
+   * Shorthand to handle a fire and forget global event
+   * @param {*} res
+   * @param {*} action
+   */
+  function handleGlobalEvent(res: Response, action: string) {
+    mainWindow.webContents.send("globalEvent", action);
+    res.sendStatus(200);
+  }
+
+  const expressApp = express();
+  expressApp.get("/", (req, res) => res.send("Hello World!"));
+  expressApp.get("/current", (req, res) => res.json({ ...mediaInfo, artist: mediaInfo.artists }));
+  expressApp.get("/image", (req, res) => {
+    const stream = fs.createReadStream(mediaInfo.icon);
+    stream.on("open", function () {
+      res.set("Content-Type", "image/png");
+      stream.pipe(res);
+    });
+    stream.on("error", function () {
+      res.set("Content-Type", "text/plain");
+      res.status(404).end("Not found");
+    });
+  });
+
+  if (settingsStore.get(settings.playBackControl)) {
+    expressApp.get("/play", (req, res) => handleGlobalEvent(res, globalEvents.play));
+    expressApp.get("/pause", (req, res) => handleGlobalEvent(res, globalEvents.pause));
+    expressApp.get("/next", (req, res) => handleGlobalEvent(res, globalEvents.next));
+    expressApp.get("/previous", (req, res) => handleGlobalEvent(res, globalEvents.previous));
+    expressApp.get("/playpause", (req, res) => {
+      if (mediaInfo.status === MediaStatus.playing) {
+        handleGlobalEvent(res, globalEvents.pause);
+      } else {
+        handleGlobalEvent(res, globalEvents.play);
+      }
+    });
+  }
+
+  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") {
+      message = `Port ${port} in use.`;
+    }
+
+    dialog.showErrorBox("Api failed to start.", message);
+  });
+};

src/scripts/mediaInfo.ts

@@ -1,6 +1,5 @@
 import { MediaInfo } from "../models/mediaInfo";
 import { MediaStatus } from "../models/mediaStatus";
-import { RepeatState } from "../models/repeatState";
 
 export const mediaInfo = {
   title: "",
@@ -10,17 +9,8 @@ export const mediaInfo = {
   status: MediaStatus.paused as string,
   url: "",
   current: "",
-  currentInSeconds: 0,
   duration: "",
-  durationInSeconds: 0,
   image: "tidal-hifi-icon",
-  favorite: false,
-
-  player: {
-    status: MediaStatus.paused as string,
-    shuffle: false,
-    repeat: RepeatState.off as string,
-  }
 };
 
 export const updateMediaInfo = (arg: MediaInfo) => {
@@ -28,18 +18,11 @@ export const updateMediaInfo = (arg: MediaInfo) => {
   mediaInfo.artists = propOrDefault(arg.artists);
   mediaInfo.album = propOrDefault(arg.album);
   mediaInfo.icon = propOrDefault(arg.icon);
-  mediaInfo.url = toUniversalUrl(propOrDefault(arg.url));
+  mediaInfo.url = 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;
-
-  mediaInfo.player.status = propOrDefault(arg.player?.status);
-  mediaInfo.player.shuffle = arg.player.shuffle;
-  mediaInfo.player.repeat = propOrDefault(arg.player?.repeat);
 };
 
 /**
@@ -48,18 +31,5 @@ export const updateMediaInfo = (arg: MediaInfo) => {
  * @param {*} defaultValue defaults to ""
  */
 function propOrDefault(prop: string, defaultValue = "") {
-  return prop || defaultValue;
+  return prop ? prop : defaultValue;
-}
-
-/**
- * Append the universal link syntax (?u) to any url
- * @param url url to append the universal link syntax to
- * @returns url with `?u` appended, or the original value of url if falsy
- */
-function toUniversalUrl(url: string) {
-  if (url) {
-    const queryParamsSet = url.indexOf("?");
-    return queryParamsSet > -1 ? `${url}&u` : `${url}?u`;
-  }
-  return url;
 }

src/scripts/settings.ts

@@ -1,29 +1,10 @@
 import Store from "electron-store";
 
-import { BrowserWindow, shell } from "electron";
-import path from "path";
 import { settings } from "../constants/settings";
+import path from "path";
+import { BrowserWindow } from "electron";
 
 let settingsWindow: BrowserWindow;
-/**
- * Build a migration step for several settings.
- * All settings will be checked and set to the default if non-existent.
- * @param version
- * @param migrationStore
- * @param options
- */
-const buildMigration = (
-  version: string,
-  migrationStore: { get: (str: string) => string; set: (str: string, val: unknown) => void },
-  options: Array<{ key: string; value: unknown }>
-) => {
-  console.log(`running migrations for ${version}`);
-  options.forEach(({ key, value }) => {
-    const valueToSet = migrationStore.get(key) ?? value;
-    console.log(`  - setting ${key} to ${value}`);
-    migrationStore.set(key, valueToSet);
-  });
-};
 
 export const settingsStore = new Store({
   defaults: {
@@ -37,19 +18,10 @@ export const settingsStore = new Store({
     disableHardwareMediaKeys: false,
     enableCustomHotkeys: false,
     enableDiscord: false,
-    discord: {
-      showSong: true,
-      idleText: "Browsing Tidal",
-      usingText: "Playing media on TIDAL",
-      includeTimestamps: true,
-      detailsPrefix: "Listening to ",
-      buttonText: "Play on Tidal",
-    },
     ListenBrainz: {
       enabled: false,
       api: "https://api.listenbrainz.org",
       token: "",
-      delay: 5000,
     },
     flags: {
       disableHardwareMediaKeys: false,
@@ -77,30 +49,6 @@ export const settingsStore = new Store({
         migrationStore.get("disableHardwareMediaKeys") ?? false
       );
     },
-    "5.7.0": (migrationStore) => {
-      console.log("running migrations for 5.7.0");
-      migrationStore.set(
-        settings.ListenBrainz.delay,
-        migrationStore.get(settings.ListenBrainz.delay) ?? 5000
-      );
-    },
-    "5.8.0": (migrationStore) => {
-      console.log("running migrations for 5.8.0");
-      migrationStore.set(
-        settings.discord.includeTimestamps,
-        migrationStore.get(settings.discord.includeTimestamps) ?? true
-      );
-    },
-    "5.9.0": (migrationStore) => {
-      buildMigration("5.9.0", migrationStore, [
-        { key: settings.discord.showSong, value: "true" },
-        { key: settings.discord.idleText, value: "Browsing Tidal" },
-        {
-          key: settings.discord.usingText,
-          value: "Playing media on TIDAL",
-        },
-      ]);
-    },
   },
 });
 
@@ -111,8 +59,8 @@ const settingsModule = {
 
 export const createSettingsWindow = function () {
   settingsWindow = new BrowserWindow({
-    width: 650,
+    width: 700,
-    height: 700,
+    height: 600,
     resizable: true,
     show: false,
     transparent: true,
@@ -134,18 +82,10 @@ export const createSettingsWindow = function () {
 
   settingsWindow.loadURL(`file://${__dirname}/../pages/settings/settings.html`);
 
-  settingsWindow.webContents.setWindowOpenHandler(({ url }) => {
-    shell.openExternal(url);
-    return { action: "deny" };
-  });
   settingsModule.settingsWindow = settingsWindow;
 };
 
 export const showSettingsWindow = function (tab = "general") {
-  if (!settingsWindow) {
-    console.log("Settings window is not initialized. Attempting to create it.");
-    createSettingsWindow();
-  }
   settingsWindow.webContents.send("goToTab", tab);
 
   // refresh data just before showing the window

src/themes/Tokyo Night.scss

@@ -74,7 +74,7 @@ button.feedBell--kvAbD {
 .container--PFTHk {
   background-color: var(--right-queue-background);
 }
-.container--cl4MJ {
+.container--cl4MJ{
   background-color: var(--search-background);
 }
 .searchFieldHighlighted--Fitvs {
@@ -83,122 +83,3 @@ button.feedBell--kvAbD {
 .searchField--EGBSq {
   background-color: var(--search-background);
 }
-
-// Settings window styling
-
-.settings-window {
-  color: var(--sidebar-menu-playlist-text);
-}
-.settings-window__wrapper {
-  background: var(--main-background);
-  box-shadow: inset 0 0 2px 0 var(--main-feed-button-background);
-}
-
-.settings-window__close-button:hover {
-  background: var(--main-feed-button-background);
-}
-
-.settings input:checked + label {
-  border-bottom: 2px solid var(--player-control-active-button);
-  color: var(--player-control-active-button);
-}
-
-.tabs::-webkit-scrollbar-thumb {
-  background-color: #404248;
-  box-shadow: inset 0 0 10px 2px var(--search-background);
-}
-
-.group {
-  border-bottom: 1px solid #333;
-}
-
-.group__description p {
-  color: var(--sidebar-menu-top-text);
-}
-.group__description .text-input {
-  border-bottom: solid 1px #333;
-  color: var(--sidebar-menu-top-text);
-}
-.group__description .text-input:focus {
-  border-color: var(--player-control-active-button);
-  color: var(--sidebar-menu-playlist-text);
-}
-
-.switch input:checked + .switch__slider {
-  background-color: var(--player-control-active-button);
-}
-.switch input:checked + .switch__slider::before {
-  background-color: var(--sidebar-menu-playlist-text);
-}
-.switch input:focus + .switch__slider {
-  box-shadow: inset 0 0 0 1px var(--player-control-active-button);
-}
-.switch__slider {
-  background-color: var(--search-background);
-}
-.switch__slider::before {
-  background-color: var(--sidebar-menu-playlist-text);
-}
-
-.textarea {
-  background: var(--search-background);
-  color: var(--sidebar-menu-top-text);
-}
-.textarea:focus {
-  border-color: var(--player-control-active-button);
-  color: var(--sidebar-menu-playlist-text);
-}
-
-.about-section__version a {
-  background-color: #404248;
-  color: var(--player-control-active-button);
-}
-.about-section__links a {
-  color: var(--sidebar-menu-playlist-text);
-
-  background-color: var(--search-background);
-}
-.about-section__links a i {
-  color: var(--sidebar-menu-playlist-text);
-}
-.about-section__links a:hover {
-  background-color: var(--player-control-favorite);
-}
-
-.footer__note {
-  color: var(--sidebar-menu-top-text);
-}
-.footer__button {
-  background: #404248;
-  color: var(--sidebar-menu-playlist-text);
-}
-.footer__button:hover {
-  background: #55585f;
-}
-
-.file-drop-area {
-  border: 1px dashed var(--sidebar-menu-top-text);
-}
-.file-drop-area.is-active {
-  background-color: #17171a;
-}
-
-.file-btn {
-  background-color: #17171a;
-  border: 1px solid var(--sidebar-menu-top-text);
-}
-
-.select-input {
-  border-bottom: solid 1px #333;
-  color: var(--sidebar-menu-top-text);
-}
-.select-input:focus {
-  border-color: var(--player-control-active-button);
-  color: var(--sidebar-menu-playlist-text);
-}
-.select-input option {
-  background-color: var(--search-background);
-}
-.select-input option:disabled {
-  color: var(--sidebar-menu-playlist-text);
-}