Merge ed6f04b6d4 into 11cc209025

.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

@@ -1,26 +1,14 @@
 {
   "cSpell.words": [
-    "Brainz",
-    "Castlabs",
     "flac",
-    "Flatpak",
     "geqnfr",
     "hifi",
-    "libnotify",
-    "listenbrainz",
     "playpause",
-    "prs",
     "rescrobbler",
-    "scrobble",
-    "scrobbling",
     "Songwhip",
     "trackid",
     "tracklist",
     "widevine",
     "xesam"
-  ],
+  ]
-  "sonarlint.connectedMode.project": {
-    "connectionId": "public-sonarcloud",
-    "projectKey": "Mastermindzh_tidal-hifi"
-  }
 }

CHANGELOG.md

@@ -4,68 +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.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]
-
-- Added support for Wayland (on by default) fixes [#262](https://github.com/Mastermindzh/tidal-hifi/issues/262) and [#157](https://github.com/Mastermindzh/tidal-hifi/issues/157)
-- Made it clear in the readme that this TIDAL Hi-Fi client supports High & Max audio settings. fixes [#261](https://github.com/Mastermindzh/tidal-hifi/issues/261)
-- Added app suspension inhibitors when music is playing. fixes [#257](https://github.com/Mastermindzh/tidal-hifi/issues/257)
-- Fixed bug with theme files from user directory trying to load: "an error occurred reading the theme file"
-- Fixed: config flags not being set correctly
-- [DEV]:
-  - Logger is now static and will automatically call either ipcRenderer or ipcMain
-
-## 5.5.0
-
-- ListenBrainz integration added (thanks @Mar0xy)
-
 ## 5.4.0
 
 - Removed Windows builds (from publishes) as they don't work anymore.
@@ -80,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - SPKChaosPhoenix updated the beautiful Tokyo Night theme:
 
-![tidal with the tokyo night theme applied](./docs/images/tokyo-night.png)
+![](./docs/images/tokyo-night.png)
 
 ## 5.2.0
 
@@ -137,7 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - New settings window by BlueManCZ
 - Fixed the desktop files in electron-builder
   - icon is set to new static path based on Arch/Debian
-  - Name has changed to TIDAL Hi-Fi
+  - Name has changed to Tidal-Hifi
 
 ## 4.1.2
 
@@ -185,7 +123,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Updated to Electron 15
 - Fixed the develop "build-unpacked" command
-- Added setting to disable multiple TIDAL Hi-Fi windows (defaults to true)
+- Added setting to disable multiple tidal-hifi windows (defaults to true)
 - Added setting to disable HardwareMediaKeyHandling (defaults to false)
 
 ## 2.8.2
@@ -223,7 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 2.5.0
 
-- Notify-send now correctly shows "Tidal Hi-Fi" as the program name
+- Notify-send now correctly shows "Tidal HiFi" as the program name
 - Updated dependencies (including electron itself)
 
 ### known issues

README.md

@@ -1,20 +1,20 @@
-# TIDAL Hi-Fi (Max quality)<img src = "./build/icon.png" height="40" align="right"/>
+# Tidal-hifi<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 support thanks to widevine.
 
-![TIDAL Hi-Fi preview](./docs/images/preview.png)
+![tidal-hifi preview](./docs/images/preview.png)
 
 ## Table of Contents
 
 <!-- toc -->
 
-- [TIDAL Hi-Fi (Max quality)](#tidal-hi-fi-max-quality)
+- [Tidal-hifi](#tidal-hifi)
   - [Table of Contents](#table-of-contents)
   - [Features](#features)
   - [Contributions](#contributions)
-  - [Why did I create TIDAL Hi-Fi?](#why-did-i-create-tidal-hi-fi)
+  - [Why did I create tidal-hifi?](#why-did-i-create-tidal-hifi)
     - [Why not extend existing projects?](#why-not-extend-existing-projects)
   - [Installation](#installation)
     - [Dependencies](#dependencies)
@@ -26,6 +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)
+      - [last.fm doesn't work out of the box. Use rescrobbler as a workaround](#lastfm-doesnt-work-out-of-the-box-use-rescrobbler-as-a-workaround)
       - [DRM not working on Windows](#drm-not-working-on-windows)
   - [Special thanks to](#special-thanks-to)
   - [Donations](#donations)
@@ -37,33 +38,28 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 
 ## Features
 
-- HiFi playback (High & Max settings)
+- HiFi playback
 - 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/)
+- Songwhip.com integration (hotkey `ctrl + w`)
-- [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))
-- 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
+- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
-  - Songwhip.com integration (hotkey `ctrl + w`)
+- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
-  - 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)
 
-## Why did I create TIDAL Hi-Fi?
+## Why did I create tidal-hifi?
 
 I moved from Spotify over to Tidal and found Linux support to be lacking.
+
 When I started this project there weren't any Linux apps that offered Tidal's "hifi" options nor any scripts to control it.
-I made this app to support the highest quality audio available on the Linux platform. It used to be "hifi" but now is ["High & Max"](https://tidal.com/sound-quality).
 
 ### Why not extend existing projects?
 
@@ -104,10 +100,10 @@ To install with `snap` you need to download the pre-packaged snap-package from t
 
 ### Arch Linux
 
-Arch Linux users can use the AUR to install TIDAL Hi-Fi:
+Arch Linux users can use the AUR to install tidal-hifi:
 
 ```sh
-trizen tidal-hifi-git
+trizen tidal-hifi-bin
 ```
 
 ### Flatpak
@@ -131,27 +127,37 @@ 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)
-- cd TIDAL Hi-Fi
+- cd tidal-hifi
 - npm install
 - npm start
 
 ## Integrations
 
-TIDAL Hi-Fi comes with several integrations out of the box.
+Tidal-hifi comes with several integrations out of the box.
 You can find these in the settings menu (`ctrl + =` by default) under the "integrations" tab.
 
 ![integrations menu, showing a list of integrations](./docs/images/integrations.png)
 
-Integrations with other projects that are not included natively:
+It currently includes:
+
+- MPRIS - MPRIS media player controls/status
+- Discord - Shows what you're listening to on Discord.
+
+Not included:
 
 - [i3 blocks config](https://github.com/Mastermindzh/dotfiles/commit/9714b2fa1d670108ce811d5511fd3b7a43180647) - My dotfiles where I use this app to fetch currently playing music (direct commit)
-- [neptune](https://github.com/uwu/neptune) third party plugins & theming
 
-## Known bugs
+### Known bugs
 
-### DRM not working on Windows
+#### last.fm doesn't work out of the box. Use rescrobbler as a workaround
 
-Most Windows users run into DRM issues when trying to use TIDAL Hi-Fi.
+The last.fm login doesn't work, as is evident from the following issue: [Last.fm login doesn't work](https://github.com/Mastermindzh/tidal-hifi/issues/4).
+However, in that same issue you can read about a workaround using [rescrobbler](https://github.com/InputUsername/rescrobbled).
+For now that will be the default workaround.
+
+#### DRM not working on Windows
+
+Most Windows users run into DRM issues when trying to use Tidal-hifi.
 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.
 
 ## Special thanks to

SECURITY.md

@@ -1,11 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the very latest 😄.
-
-## Reporting a Vulnerability
-
-If you find a vulnerability just add it as an issue.
-If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
-

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,7 +11,7 @@ extraResources:
   - "themes/**"
 linux:
   category: AudioVideo
-  icon: build/icons/256x256.png
+  icon: assets/icons
   target:
     - dir
   executableName: tidal-hifi

docs/theming.md

@@ -1,10 +1,10 @@
-# Theming TIDAL Hi-Fi
+# Theming tidal-hifi
 
 ## Table of contents
 
 <!-- toc -->
 
-- [Theming TIDAL Hi-Fi](#theming-TIDAL Hi-Fi)
+- [Theming tidal-hifi](#theming-tidal-hifi)
   - [Table of contents](#table-of-contents)
   - [Custom CSS](#custom-css)
   - [config](#config)
@@ -12,7 +12,7 @@
 
 <!-- tocstop -->
 
-By default TIDAL Hi-Fi comes with a few themes.
+By default tidal-hifi comes with a few themes.
 You can select these in the settings window under the theming tab as shown below.
 
 ![Settings window with the theming tab opened](./images/theming.png)

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.9.0",
+  "version": "5.4.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",
@@ -39,38 +38,38 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.1.1",
+    "@electron/remote": "^2.0.10",
-    "axios": "^1.6.5",
+    "axios": "^1.4.0",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.1.0",
     "express": "^4.18.2",
-    "hotkeys-js": "^3.13.5",
+    "hotkeys-js": "^3.11.2",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.70.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/flags.ts

@@ -1,9 +1,4 @@
 export const flags: { [key: string]: { flag: string; value?: string }[] } = {
   gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
   disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
-  enableWaylandSupport: [
-    { flag: "enable-features", value: "UseOzonePlatform" },
-    { flag: "ozone-platform-hint", value: "auto" },
-    { flag: "enable-features", value: "WaylandWindowDecorations" },
-  ],
 };

src/constants/globalEvents.ts

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

src/constants/settings.ts

@@ -20,26 +20,16 @@ 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",
     disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
     gpuRasterization: "flags.gpuRasterization",
-    enableWaylandSupport: "flags.enableWaylandSupport",
   },
   menuBar: "menuBar",
   minimizeOnClose: "minimizeOnClose",

src/constants/statuses.ts

@@ -0,0 +1,4 @@
+export const statuses = {
+  playing: "playing",
+  paused: "paused",
+};

src/constants/values.ts

@@ -1,3 +1,3 @@
 export default {
-  name: "TIDAL Hi-Fi",
+  name: "tidal-hifi",
 };

src/features/flags/flags.ts

@@ -1,42 +0,0 @@
-import { App } from "electron";
-import { flags } from "../../constants/flags";
-import { settings } from "../../constants/settings";
-import { settingsStore } from "../../scripts/settings";
-import { Logger } from "../logger";
-
-/**
- * Set default Electron flags
- */
-export function setDefaultFlags(app: App) {
-  setFlag(app, "disable-seccomp-filter-sandbox");
-  setFlag(app, "disable-features", "MediaSessionService");
-}
-
-/**
- * Set Tidal's managed flags from the user settings
- * @param app
- */
-export function setManagedFlagsFromSettings(app: App) {
-  const flagsFromSettings = settingsStore.get(settings.flags.root);
-  if (flagsFromSettings) {
-    for (const [key, value] of Object.entries(flagsFromSettings)) {
-      if (value) {
-        flags[key].forEach((flag) => {
-          setFlag(app, flag.flag, flag.value);
-        });
-      }
-    }
-  }
-}
-
-/**
- * Set a single flag for Electron
- * @param app app to set it on
- * @param flag flag name
- * @param value value to be set for the flag
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function setFlag(app: App, flag: string, value?: any) {
-  Logger.log(`enabling command line option ${flag} with value ${value}`);
-  app.commandLine.appendSwitch(flag, value);
-}

src/features/idleInhibitor/idleInhibitor.ts

@@ -1,65 +0,0 @@
-import { PowerSaveBlocker, powerSaveBlocker } from "electron";
-import { Logger } from "../logger";
-
-/**
- * Start blocking idle/screen timeouts
- * @param blocker optional instance of the powerSaveBlocker to use
- * @returns id of current block
- */
-export const acquireInhibitor = (blocker?: PowerSaveBlocker): number => {
-  const currentBlocker = blocker ?? powerSaveBlocker;
-  const blockId = currentBlocker.start("prevent-app-suspension");
-  Logger.log(`Started preventing app suspension with id: ${blockId}`);
-  return blockId;
-};
-
-/**
- * Check whether there is a blocker active for the current id, if not start it.
- * @param id id of inhibitor you want to check activity against
- * @param blocker optional instance of the powerSaveBlocker to use
- */
-export const acquireInhibitorIfInactive = (id: number, blocker?: PowerSaveBlocker): number => {
-  const currentBlocker = blocker ?? powerSaveBlocker;
-  if (!isInhibitorActive(id, currentBlocker)) {
-    return acquireInhibitor();
-  }
-
-  return id;
-};
-
-/**
- * stop blocking idle/screen timeouts
- * @param id id of inhibitor you want to check activity against
- * @param blocker optional instance of the powerSaveBlocker to use
- */
-export const releaseInhibitor = (id: number, blocker?: PowerSaveBlocker) => {
-  try {
-    const currentBlocker = blocker ?? powerSaveBlocker;
-    currentBlocker.stop(id);
-    Logger.log(`Released inhibitor with id: ${id}`);
-  } catch (error) {
-    Logger.log("Releasing inhibitor failed");
-  }
-};
-
-/**
- * stop blocking idle/screen timeouts if a inhibitor is active
- * @param id id of inhibitor you want to check activity against
- * @param blocker optional instance of the powerSaveBlocker to use
- */
-export const releaseInhibitorIfActive = (id: number, blocker?: PowerSaveBlocker) => {
-  const currentBlocker = blocker ?? powerSaveBlocker;
-  if (isInhibitorActive(id, currentBlocker)) {
-    releaseInhibitor(id, currentBlocker);
-  }
-};
-
-/**
- * check whether the inhibitor is active
- * @param id id of inhibitor you want to check activity against
- * @param blocker optional instance of the powerSaveBlocker to use
- */
-export const isInhibitorActive = (id: number, blocker?: PowerSaveBlocker) => {
-  const currentBlocker = blocker ?? powerSaveBlocker;
-  return currentBlocker.isStarted(id);
-};

src/features/listenbrainz/listenbrainz.ts

@@ -1,34 +1,12 @@
 import axios from "axios";
-import Store from "electron-store";
+import { settingsStore } from "../../scripts/settings";
 import { settings } from "../../constants/settings";
 import { MediaStatus } from "../../models/mediaStatus";
-import { settingsStore } from "../../scripts/settings";
+import Store from "electron-store";
-import { Logger } from "../logger";
-import { StoreData } from "./models/storeData";
 
-const ListenBrainzStore = new Store({ name: "listenbrainz" });
+const ListenBrainzStore = new Store({name: "listenbrainz"});
-
-export const ListenBrainzConstants = {
-  oldData: "oldData",
-};
 
 export class ListenBrainz {
-  /**
-   * Create the object to store old information in the Store :)
-   * @param title
-   * @param artists
-   * @param duration
-   * @returns data passed along in an object + a "listenedAt" key with the current time
-   */
-  private static constructStoreData(title: string, artists: string, duration: number): StoreData {
-    return {
-      listenedAt: Math.floor(new Date().getTime() / 1000),
-      title,
-      artists,
-      duration,
-    };
-  }
-
   /**
    * Call the ListenBrainz API and create playing now payload and scrobble old song
    * @param title
@@ -36,18 +14,13 @@ export class ListenBrainz {
    * @param status
    * @param duration
    */
-  public static async scrobble(
+  public static async scrobble(title: string, artists: string, status: string, duration: number): Promise<any> {
-    title: string,
-    artists: string,
-    status: string,
-    duration: number
-  ): Promise<void> {
     try {
-      if (status === MediaStatus.paused) {
+      if (status == MediaStatus.paused) {
-        return;
+        return false;
       } else {
-        // Fetches the oldData required for scrobbling and proceeds to construct a playing_now data payload for the Playing Now area
+        // 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 OldData = ListenBrainzStore.get("OldData") as string[];
         const playing_data = {
             listen_type: "playing_now",
             payload: [
@@ -61,72 +34,50 @@ export class ListenBrainz {
                         },
                         artist_name: artists,
                         track_name: title,
-              },
+                    }
-            },
+                }
-          ],
+            ]
         };
 
-        await axios.post(
+        await axios.post(`${settingsStore.get(settings.ListenBrainz.api)}/1/submit-listens`, playing_data, {
-          `${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
+            headers:{
-          playing_data,
-          {
-            headers: {
                 "Content-Type": "application/json",
-              Authorization: `Token ${settingsStore.get<string, string>(
+                "Authorization": `Token ${settingsStore.get(settings.ListenBrainz.token)}`
-                settings.ListenBrainz.token
-              )}`,
-            },
             }
-        );
+        });
-        if (!oldData) {
+        if (!OldData) {
-          ListenBrainzStore.set(
+            ListenBrainzStore.set("OldData", [Math.floor(new Date().getTime() / 1000), title, artists, duration]);
-            ListenBrainzConstants.oldData,
+        } else if (OldData[1] != title) {
-            this.constructStoreData(title, artists, duration)
-          );
-        } else {
-          if (oldData.title !== title) {
             // This constructs the data required to scrobble the data after the song finishes
             const scrobble_data = {
                 listen_type: "single",
                 payload: [
                     {
-                  listened_at: oldData.listenedAt,
+                        listened_at: OldData[0],
                         track_metadata: {
                             additional_info: {
                                 media_player: "Tidal Hi-Fi",
                                 submission_client: "Tidal Hi-Fi",
                                 music_service: "listen.tidal.com",
-                      duration: oldData.duration,
+                                duration: OldData[3],
                             },
-                    artist_name: oldData.artists,
+                            artist_name: OldData[2],
-                    track_name: oldData.title,
+                            track_name: OldData[1],
-                  },
+                        }
-                },
+                    }
-              ],
+                ]
             };
-            await axios.post(
+            await axios.post(`${settingsStore.get(settings.ListenBrainz.api)}/1/submit-listens`, scrobble_data, {
-              `${settingsStore.get<string, string>(settings.ListenBrainz.api)}/1/submit-listens`,
+                headers:{
-              scrobble_data,
-              {
-                headers: {
                     "Content-Type": "application/json",
-                  Authorization: `Token ${settingsStore.get<string, string>(
+                    "Authorization": `Token ${settingsStore.get(settings.ListenBrainz.token)}`
-                    settings.ListenBrainz.token
-                  )}`,
-                },
-              }
-            );
-            ListenBrainzStore.set(
-              ListenBrainzConstants.oldData,
-              this.constructStoreData(title, artists, duration)
-            );
                 }
+            });
+            ListenBrainzStore.set("OldData", [Math.floor(new Date().getTime() / 1000), title, artists, duration]);
         }
       }
     } catch (error) {
-      Logger.log(JSON.stringify(error));
+      console.log(JSON.stringify(error));
     }
   }
 }
-
-export { ListenBrainzStore };

src/features/listenbrainz/models/storeData.ts

@@ -1,9 +0,0 @@
-/**
- * Data saved for ListenBrainz
- */
-export interface StoreData {
-  listenedAt: number;
-  title: string;
-  artists: string;
-  duration: number;
-}

src/features/logger.ts

@@ -1,52 +1,33 @@
-import { IpcMain, ipcMain, IpcMainEvent, ipcRenderer } from "electron";
+import { IpcMain, IpcRenderer } from "electron";
 import { globalEvents } from "../constants/globalEvents";
 
 export class Logger {
+  /**
+   *
+   * @param ipcRenderer renderer IPC client so we can send messages to the main thread
+   */
+  constructor(private ipcRenderer: IpcRenderer) {}
+
   /**
    * Subscribe to watch for logs from the IPC client
    * @param ipcMain main thread IPC client so we can subscribe to events
    */
   public static watch(ipcMain: IpcMain) {
-    ipcMain.on(
+    ipcMain.on(globalEvents.log, (event, content, object) => {
-      globalEvents.log,
+      console.log(content, JSON.stringify(object, null, 2));
-      (event: IpcMainEvent | { content: string; message: string }, message) => {
+    });
-        const { content, object } = message ?? event;
-        this.logToSTDOut(content, object);
-      }
-    );
   }
+
   /**
    * Log content to STDOut
    * @param content
    * @param object js(on) object that will be prettyPrinted
    */
-  public static log(content: string, object: object = {}) {
+  public log(content: string, object: object = {}) {
-    if (ipcRenderer) {
+    if (this.ipcRenderer) {
-      ipcRenderer.send(globalEvents.log, { content, object });
+      this.ipcRenderer.send(globalEvents.log, { content, object });
     } else {
-      ipcMain.emit(globalEvents.log, { content, object });
+      console.log(`${content} \n ${JSON.stringify(object, null, 2)}`);
     }
   }
-
-  /**
-   * Log content to STDOut and use the provided alert function to alert
-   * @param content
-   * @param object js(on) object that will be prettyPrinted
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public static alert(content: string, object: any = {}, alert?: (msg: string) => void) {
-    Logger.log(content, object);
-    if (alert) {
-      alert(`${content} \n\nwith details: \n${JSON.stringify(object, null, 2)}`);
-    }
-  }
-
-  /**
-   * Log to STDOut
-   * @param content
-   * @param object
-   */
-  private static logToSTDOut(content: string, object = {}) {
-    console.log(content, Object.keys(object).length > 0 ? JSON.stringify(object, null, 2) : "");
-  }
 }

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

@@ -1,7 +1,7 @@
 import { enable, initialize } from "@electron/remote/main";
 import {
-  app,
   BrowserWindow,
+  app,
   components,
   globalShortcut,
   ipcMain,
@@ -9,18 +9,9 @@ import {
   session,
 } from "electron";
 import path from "path";
+import { flags } from "./constants/flags";
 import { globalEvents } from "./constants/globalEvents";
 import { mediaKeys } from "./constants/mediaKeys";
-import { settings } from "./constants/settings";
-import { setDefaultFlags, setManagedFlagsFromSettings } from "./features/flags/flags";
-import {
-  acquireInhibitorIfInactive,
-  releaseInhibitorIfActive,
-} from "./features/idleInhibitor/idleInhibitor";
-import { Logger } from "./features/logger";
-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";
@@ -29,28 +20,45 @@ import {
   closeSettingsWindow,
   createSettingsWindow,
   hideSettingsWindow,
-  settingsStore,
   showSettingsWindow,
+  settingsStore,
 } from "./scripts/settings";
+import { settings } from "./constants/settings";
 import { addTray, refreshTray } from "./scripts/tray";
+import { MediaInfo } from "./models/mediaInfo";
+import { Songwhip } from "./features/songwhip/songwhip";
+import { Logger } from "./features/logger";
 const tidalUrl = "https://listen.tidal.com";
-let mainInhibitorId = -1;
 
 initialize();
+
 let mainWindow: BrowserWindow;
 const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
-const windowPreferences = {
-  sandbox: false,
-  plugins: true,
-  devTools: true, // I like tinkering, others might too
-};
 
-setDefaultFlags(app);
+setFlags();
-setManagedFlagsFromSettings(app);
+
+function setFlags() {
+  const flagsFromSettings = settingsStore.get(settings.flags.root);
+  if (flagsFromSettings) {
+    for (const [key, value] of Object.entries(flags)) {
+      if (value) {
+        flags[key].forEach((flag) => {
+          console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
+          app.commandLine.appendSwitch(flag.flag, flag.value);
+        });
+      }
+    }
+  }
+
+  /**
+   * Fix Display Compositor issue.
+   */
+  app.commandLine.appendSwitch("disable-seccomp-filter-sandbox");
+}
 
 /**
- * Update the menuBarVisibility according to the store value
+ * Update the menuBarVisbility according to the store value
  *
  */
 function syncMenuBarWithStore() {
@@ -82,16 +90,16 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   mainWindow = new BrowserWindow({
     x: options.x,
     y: options.y,
-    width: settingsStore?.get(settings.windowBounds.width),
+    width: settingsStore && settingsStore.get(settings.windowBounds.width),
-    height: settingsStore?.get(settings.windowBounds.height),
+    height: settingsStore && settingsStore.get(settings.windowBounds.height),
     icon,
     backgroundColor: options.backgroundColor,
     autoHideMenuBar: true,
     webPreferences: {
-      ...windowPreferences,
+      sandbox: false,
-      ...{
       preload: path.join(__dirname, "preload.js"),
-      },
+      plugins: true,
+      devTools: true, // I like tinkering, others might too
     },
   });
   enable(mainWindow.webContents);
@@ -116,7 +124,6 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
   });
   // Emitted when the window is closed.
   mainWindow.on("closed", function () {
-    releaseInhibitorIfActive(mainInhibitorId);
     closeSettingsWindow();
     app.quit();
   });
@@ -124,18 +131,6 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
     const { width, height } = mainWindow.getBounds();
     settingsStore.set(settings.windowBounds.root, { width, height });
   });
-  mainWindow.webContents.setWindowOpenHandler(() => {
-    return {
-      action: "allow",
-      overrideBrowserWindowOptions: {
-        webPreferences: {
-          sandbox: false,
-          plugins: true,
-          devTools: true, // I like tinkering, others might too
-        },
-      },
-    };
-  });
 }
 
 function registerHttpProtocols() {
@@ -201,12 +196,6 @@ app.on("browser-window-created", (_, window) => {
 // IPC
 ipcMain.on(globalEvents.updateInfo, (_event, arg: MediaInfo) => {
   updateMediaInfo(arg);
-  if (arg.status === MediaStatus.playing) {
-    mainInhibitorId = acquireInhibitorIfInactive(mainInhibitorId);
-  } else {
-    releaseInhibitorIfActive(mainInhibitorId);
-    mainInhibitorId = -1;
-  }
 });
 
 ipcMain.on(globalEvents.hideSettings, () => {
@@ -235,7 +224,7 @@ ipcMain.on(globalEvents.error, (event) => {
 });
 
 ipcMain.handle(globalEvents.whip, async (event, url) => {
-  return Songwhip.whip(url);
+  return await Songwhip.whip(url);
 });
 
 Logger.watch(ipcMain);

src/models/mediaInfo.ts

@@ -10,5 +10,4 @@ export interface MediaInfo {
   current: string;
   duration: string;
   image: string;
-  favorite: boolean;
 }

src/models/options.ts

@@ -9,5 +9,4 @@ export interface Options {
   "app-name": string;
   image: string;
   icon: string;
-  favorite: boolean;
 }

src/pages/settings/preload.ts

@@ -3,30 +3,9 @@ import { ipcRenderer, shell } from "electron";
 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,
@@ -49,17 +28,7 @@ let adBlock: HTMLInputElement,
   updateFrequency: HTMLInputElement,
   enableListenBrainz: HTMLInputElement,
   ListenBrainzAPI: HTMLInputElement,
-  ListenBrainzToken: HTMLInputElement,
+  ListenBrainzToken: HTMLInputElement;
-  listenbrainz_delay: 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 +57,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,25 +67,10 @@ 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
  */
 function refreshSettings() {
-  try {
   adBlock.checked = settingsStore.get(settings.adBlock);
   api.checked = settingsStore.get(settings.api);
   customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
@@ -125,7 +78,6 @@ function refreshSettings() {
   disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
   enableCustomHotkeys.checked = settingsStore.get(settings.enableCustomHotkeys);
   enableDiscord.checked = settingsStore.get(settings.enableDiscord);
-    enableWaylandSupport.checked = settingsStore.get(settings.flags.enableWaylandSupport);
   gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
   menuBar.checked = settingsStore.get(settings.menuBar);
   minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
@@ -142,21 +94,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 +110,14 @@ function hide() {
   ipcRenderer.send(globalEvents.hideSettings);
 }
 
+/**
+ * Restart tidal-hifi after changes
+ */
+function restart() {
+  app.relaunch();
+  app.exit();
+}
+
 /**
  * Bind UI components to functions after DOMContentLoaded
  */
@@ -185,28 +130,23 @@ 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 ? document.getElementById("listenbrainz__options").removeAttribute("hidden") : document.getElementById("listenbrainz__options").setAttribute("hidden", "true");
-          setElementHidden(source.checked, toggleOptions);
-        }
       }
       ipcRenderer.send(globalEvents.storeChanged);
     });
@@ -241,7 +181,6 @@ window.addEventListener("DOMContentLoaded", () => {
   disableHardwareMediaKeys = get("disableHardwareMediaKeys");
   enableCustomHotkeys = get("enableCustomHotkeys");
   enableDiscord = get("enableDiscord");
-  enableWaylandSupport = get("enableWaylandSupport");
   gpuRasterization = get("gpuRasterization");
   menuBar = get("menuBar");
   minimizeOnClose = get("minimizeOnClose");
@@ -258,23 +197,17 @@ 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);
   addInputListener(minimizeOnClose, settings.minimizeOnClose);
@@ -288,18 +221,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,72 +211,9 @@
                 <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>
+                <h4>ListenBrainz</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>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Enable ListenBrainz</h4>
                 <p>Scrobble your listens directly to ListenBrainz.</p>
               </div>
               <label class="switch">
@@ -288,27 +221,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>
@@ -320,7 +247,7 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <p>
-                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
+                  The amount of time, in milliseconds, that tidal-hifi will refresh its playback info by scraping the
                   website.
                   The default of 500 seems to work in more cases but if you are fine with a bit more resource usage you
                   can decrease it as well.
@@ -328,7 +255,6 @@
                 <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
               </div>
             </div>
-          </div>
             <div class="group">
               <p class="group__title">Flags</p>
               <div class="group__option">
@@ -366,18 +292,6 @@
                   <span class="switch__slider"></span>
                 </label>
               </div>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Wayland support</h4>
-                <p>
-                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
-                </p>
-              </div>
-              <label class="switch">
-                <input id="enableWaylandSupport" type="checkbox" />
-                <span class="switch__slider"></span>
-              </label>
-            </div>
             </div>
         </section>
 
@@ -430,24 +344,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 href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.9.0">5.9.0</a>
+            is made by
-          </div>
+            <a class="external-link" data-url="https://www.rickvanlieshout.com">
-          <div class="about-section__links">
+              Rick van Lieshout</a>. <br />It uses
-            <a href="https://github.com/mastermindzh/tidal-hifi/" class="about-section__button">Github <i
+            <a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
-                class="fa fa-external-link"></i></a>
+            version of Electron for widevine support.
-            <a href="https://github.com/Mastermindzh/tidal-hifi/issues" class="about-section__button">Report an issue <i
+          </p>
-                class="fa fa-external-link"></i></a>
-            <a 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;
@@ -422,11 +368,10 @@ html {
   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;
   }
@@ -464,7 +409,6 @@ html {
   width: 100%;
   cursor: pointer;
   opacity: 0;
-
   &:focus {
     outline: none;
   }
@@ -499,7 +443,3 @@ html {
     }
   }
 }
-
-.hidden {
-  display: none !important;
-}

src/pages/settings/theming.ts

@@ -1,5 +1,4 @@
 import fs from "fs";
-import { Logger } from "../../features/logger";
 
 const cssFilter = (file: string) => file.endsWith(".css");
 const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase());
@@ -37,7 +36,7 @@ export const getThemeListFromDirectory = (directory: string): string[] => {
     makeUserThemesDirectory(directory);
     return fs.readdirSync(directory).filter(cssFilter).sort(sort);
   } catch (err) {
-    Logger.log(`Failed to get files from ${directory}`, err);
+    console.error(err);
     return [];
   }
 };
@@ -50,6 +49,6 @@ export const makeUserThemesDirectory = (directory: string) => {
   try {
     fs.mkdirSync(directory, { recursive: true });
   } catch (err) {
-    Logger.log(`Failed to make user theme directory: ${directory}`, err);
+    console.error(err);
   }
 };

src/preload.ts

@@ -1,18 +1,12 @@
 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";
-import {
+import { statuses } from "./constants/statuses";
-  ListenBrainz,
-  ListenBrainzConstants,
-  ListenBrainzStore,
-} from "./features/listenbrainz/listenbrainz";
-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 { ListenBrainz } from "./features/listenbrainz/listenbrainz";
-import { MediaStatus } from "./models/mediaStatus";
 import { Options } from "./models/options";
 import { downloadFile } from "./scripts/download";
 import { addHotkey } from "./scripts/hotkeys";
@@ -20,14 +14,10 @@ import { settingsStore } from "./scripts/settings";
 import { setTitle } from "./scripts/window-functions";
 
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
-const appName = "TIDAL Hi-Fi";
+const appName = "Tidal Hifi";
 let currentSong = "";
 let player: Player;
-let currentPlayStatus = MediaStatus.paused;
+let currentPlayStatus = statuses.paused;
-let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
-let scrobbleWaitingForDelay = false;
-let wasJustPausedOrResumed = false;
-let currentMediaInfo: Options;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -47,7 +37,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']",
@@ -56,7 +46,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
@@ -117,7 +106,7 @@ const elements = {
       window.location.href.includes("/playlist/") ||
       window.location.href.includes("/mix/")
     ) {
-      if (currentPlayStatus === MediaStatus.playing) {
+      if (currentPlayStatus === statuses.playing) {
         // find the currently playing element from the list (which might be in an album icon), traverse back up to the mediaItem (row) and select the album cell.
         // document.querySelector("[class^='isPlayingIcon'], [data-test-is-playing='true']").closest('[data-type="mediaItem"]').querySelector('[class^="album"]').textContent
         const row = window.document.querySelector(this.currentlyPlaying).closest(this.mediaItem);
@@ -134,10 +123,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
@@ -165,12 +150,36 @@ const elements = {
   },
 };
 
+function addCustomCss() {
+  window.addEventListener("DOMContentLoaded", () => {
+    const selectedTheme = settingsStore.get(settings.theme);
+    if (selectedTheme !== "none") {
+      const themeFile = `${process.resourcesPath}/${selectedTheme}`;
+      fs.readFile(themeFile, "utf-8", (err, data) => {
+        if (err) {
+          alert("An error ocurred reading the theme file.");
+          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
  */
 function getUpdateFrequency() {
-  const storeValue = settingsStore.get<string, number>(settings.updateFrequency);
+  const storeValue = settingsStore.get(settings.updateFrequency) as number;
   const defaultValue = 500;
 
   if (!isNaN(storeValue)) {
@@ -184,7 +193,6 @@ function getUpdateFrequency() {
  * Play or pause the current song
  */
 function playPause() {
-  wasJustPausedOrResumed = true;
   const play = elements.get("play");
 
   if (play) {
@@ -194,11 +202,6 @@ function playPause() {
   }
 }
 
-/**
- * Clears the old listenbrainz data on launch
- */
-ListenBrainzStore.clear();
-
 /**
  * Add hotkeys for when tidal is focused
  * Reflects the desktop hotkeys found on:
@@ -216,10 +219,6 @@ function addHotKeys() {
       handleLogout();
     });
 
-    addHotkey("Control+a", function () {
-      elements.click("favorite");
-    });
-
     addHotkey("Control+h", function () {
       elements.click("home");
     });
@@ -276,7 +275,7 @@ function handleLogout() {
       defaultId: 2,
     })
     .then((result: { response: number }) => {
-      if (logoutOptions.indexOf("Yes, please") === result.response) {
+      if (logoutOptions.indexOf("Yes, please") == result.response) {
         for (let i = 0; i < window.localStorage.length; i++) {
           const key = window.localStorage.key(i);
           if (key.startsWith("_TIDAL_activeSession")) {
@@ -304,8 +303,6 @@ function addIPCEventListeners() {
     ipcRenderer.on("globalEvent", (_event, args) => {
       switch (args) {
         case globalEvents.playPause:
-        case globalEvents.play:
-        case globalEvents.pause:
           playPause();
           break;
         case globalEvents.next:
@@ -314,10 +311,11 @@ function addIPCEventListeners() {
         case globalEvents.previous:
           elements.click("previous");
           break;
-        case globalEvents.toggleFavorite:
+        case globalEvents.play:
-          elements.click("favorite");
+          elements.click("play");
           break;
-        default:
+        case globalEvents.pause:
+          elements.click("pause");
           break;
       }
     });
@@ -333,9 +331,9 @@ function getCurrentlyPlayingStatus() {
 
   // if pause button is visible tidal is playing
   if (pause) {
-    status = MediaStatus.playing;
+    status = statuses.playing;
   } else {
-    status = MediaStatus.paused;
+    status = statuses.paused;
   }
   return status;
 }
@@ -356,71 +354,10 @@ 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) {
       new Notification({ title: options.title, body: options.artists, icon: options.icon }).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 = {
         ...player.metadata,
@@ -433,36 +370,7 @@ function updateMpris(options: Options) {
           "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
         },
       };
-    player.playbackStatus = options.status === MediaStatus.paused ? "Paused" : "Playing";
+      player.playbackStatus = options.status == statuses.paused ? "Paused" : "Playing";
-  }
-}
-
-/**
- * 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;
-    if (
-      (!oldData && options.status === MediaStatus.playing) ||
-      (oldData && oldData.title !== options.title)
-    ) {
-      if (!scrobbleWaitingForDelay) {
-        scrobbleWaitingForDelay = true;
-        clearTimeout(currentListenBrainzDelayId);
-        currentListenBrainzDelayId = setTimeout(
-          () => {
-            ListenBrainz.scrobble(
-              options.title,
-              options.artists,
-              options.status,
-              convertDuration(options.duration)
-            );
-            scrobbleWaitingForDelay = false;
-          },
-          settingsStore.get(settings.ListenBrainz.delay) ?? 0
-        );
-      }
     }
   }
 }
@@ -510,20 +418,13 @@ setInterval(function () {
   const title = elements.getText("title");
   const artistsArray = elements.getArtistsArray();
   const artistsString = elements.getArtistsString(artistsArray);
-  const songDashArtistTitle = `${title} - ${artistsString}`;
-  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
-  const current = elements.getText("current");
-  const currentStatus = getCurrentlyPlayingStatus();
-
-  // update info if song changed or was just paused/resumed
-  if (titleOrArtistsChanged || wasJustPausedOrResumed) {
-    if (wasJustPausedOrResumed) {
-      wasJustPausedOrResumed = false;
-    }
   skipArtistsIfFoundInSkippedArtistsList(artistsArray);
 
   const album = elements.getAlbumName();
+  const current = elements.getText("current");
   const duration = elements.getText("duration");
+  const songDashArtistTitle = `${title} - ${artistsString}`;
+  const currentStatus = getCurrentlyPlayingStatus();
   const options = {
     title,
     artists: artistsString,
@@ -535,9 +436,10 @@ setInterval(function () {
     "app-name": appName,
     image: "",
     icon: "",
-      favorite: elements.isFavorite(),
   };
 
+  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
+
   // update title, url and play info with new info
   setTitle(songDashArtistTitle);
   getTrackURL();
@@ -567,12 +469,11 @@ setInterval(function () {
     updateMediaInfo(options, titleOrArtistsChanged);
     if (titleOrArtistsChanged) {
       updateMediaSession(options);
+      if (settingsStore.get(settings.ListenBrainz.enabled)) {
+        ListenBrainz.scrobble(options.title, options.artists, options.status, convertDuration(options.duration));
+      }
     }
   });
-  } else {
-    // just update the time
-    updateMediaInfo({ ...currentMediaInfo, ...{ current } }, false);
-  }
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip
@@ -593,8 +494,61 @@ setInterval(function () {
   }
 }, getUpdateFrequency());
 
-addMPRIS();
+if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
-addCustomCss(app);
+  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) {
+    console.log("player api not working");
+  }
+}
+addCustomCss();
 addHotKeys();
 addIPCEventListeners();
 addFullScreenListeners();

src/scripts/discord.ts

@@ -1,11 +1,8 @@
-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 { MediaStatus } from "../models/mediaStatus";
 import { mediaInfo } from "./mediaInfo";
-import { settingsStore } from "./settings";
 
 const clientId = "833617820704440341";
 
@@ -18,75 +15,48 @@ function timeToSeconds(timeArray: string[]) {
 export let rpc: Client;
 
 const observer = () => {
-  if (rpc) {
+  if (mediaInfo.status == MediaStatus.paused && rpc) {
-    rpc.setActivity(getActivity());
+    rpc.setActivity(idleStatus);
-  }
+  } else if (rpc) {
-};
-
-const defaultPresence = {
-  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: any, buttonText: any) {
-    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: any) {
-    if (includeTimestamps) {
     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));
-      presence.startTimestamp = now;
+    if (mediaInfo.url) {
-      presence.endTimestamp = remaining;
+      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 idleStatus = {
+  details: `Browsing Tidal`,
+  largeImageKey: "tidal-hifi-icon",
+  largeImageText: `Tidal HiFi ${app.getVersion()}`,
+  instance: false,
+};
+
 /**
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
@@ -95,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

@@ -1,14 +1,14 @@
 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 { statuses } from "./../constants/statuses";
 import { mediaInfo } from "./mediaInfo";
 import { settingsStore } from "./settings";
+import { settings } from "../constants/settings";
 
 /**
- * Function to enable TIDAL Hi-Fi's express api
+ * Function to enable tidal-hifi's express api
  */
 
 // expressModule.run = function (mainWindow)
@@ -40,14 +40,11 @@ export const startExpress = (mainWindow: BrowserWindow) => {
 
   if (settingsStore.get(settings.playBackControl)) {
     expressApp.get("/play", (req, 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) {
+      if (mediaInfo.status == statuses.playing) {
         handleGlobalEvent(res, globalEvents.pause);
       } else {
         handleGlobalEvent(res, globalEvents.play);

src/scripts/mediaInfo.ts

@@ -1,17 +1,16 @@
 import { MediaInfo } from "../models/mediaInfo";
-import { MediaStatus } from "../models/mediaStatus";
+import { statuses } from "./../constants/statuses";
 
 export const mediaInfo = {
   title: "",
   artists: "",
   album: "",
   icon: "",
-  status: MediaStatus.paused as string,
+  status: statuses.paused,
   url: "",
   current: "",
   duration: "",
   image: "tidal-hifi-icon",
-  favorite: false,
 };
 
 export const updateMediaInfo = (arg: MediaInfo) => {
@@ -24,7 +23,6 @@ export const updateMediaInfo = (arg: MediaInfo) => {
   mediaInfo.current = propOrDefault(arg.current);
   mediaInfo.duration = propOrDefault(arg.duration);
   mediaInfo.image = propOrDefault(arg.image);
-  mediaInfo.favorite = arg.favorite;
 };
 
 /**

src/scripts/menu.ts

@@ -33,6 +33,7 @@ export const getMenu = function (mainWindow: BrowserWindow) {
           {
             label: name,
             submenu: [
+              { role: "about" },
               settingsMenuEntry,
               { type: "separator" },
               { role: "services" },
@@ -100,6 +101,12 @@ export const getMenu = function (mainWindow: BrowserWindow) {
       ],
     },
     settingsMenuEntry,
+    {
+      label: "About",
+      click() {
+        showSettingsWindow("about");
+      },
+    },
     toggleWindow,
     quitMenuEntry,
   ];

src/scripts/settings.ts

@@ -1,29 +1,10 @@
 import Store from "electron-store";
 
-import { BrowserWindow } 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,24 +18,14 @@ 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,
-      enableWaylandSupport: true,
       gpuRasterization: true,
+      disableHardwareMediaKeys: false,
     },
     menuBar: true,
     minimizeOnClose: false,
@@ -77,30 +48,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 +58,8 @@ const settingsModule = {
 
 export const createSettingsWindow = function () {
   settingsWindow = new BrowserWindow({
-    width: 650,
+    width: 700,
-    height: 700,
+    height: 600,
     resizable: true,
     show: false,
     transparent: true,
@@ -138,10 +85,6 @@ export const createSettingsWindow = function () {
 };
 
 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);
-}