.editorconfig

@@ -10,10 +10,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[**.ts]
-indent_style = space
-indent_size = 2
-
 [**.json]
 indent_style = space
 indent_size = 2

.eslintrc

@@ -1,12 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ]
-}

.github/workflows/build.yml

@@ -5,10 +5,6 @@ on:
     branches-ignore:
       - master
       - develop
-  pull_request:
-    branches-ignore:
-      - master
-      - develop
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest
@@ -20,7 +16,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -30,7 +26,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
 
@@ -40,6 +36,6 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build

.github/workflows/release.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - master
       - develop
-  pull_request:
-    branches:
-      - master
-
 jobs:
   build_on_linux:
     runs-on: ubuntu-latest
@@ -20,7 +16,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -29,12 +25,12 @@ jobs:
           path: dist/
 
   build_on_mac:
-    runs-on: macos-latest
+    runs-on: macOS-latest
     steps:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master
@@ -48,7 +44,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 19
+          node-version: 16
       - run: npm install
       - run: npm run build
       - uses: actions/upload-artifact@master

.gitignore

@@ -12,8 +12,3 @@ build/linux/arch/*
 
 # JetBrains IDE configuration
 .idea
-ts-dist/**
-ts-dist
-themes
-!src/themes
-.sass-cache

.nvmrc

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

.stylelintrc.json

@@ -1,13 +0,0 @@
-{
-  "plugins": [
-    "stylelint-prettier"
-  ],
-  "extends": [
-    "stylelint-config-standard-scss"
-  ],
-  "rules": {
-    "prettier/prettier": true,
-    "scss/at-extend-no-missing-placeholder": null,
-    "no-descending-specificity": null
-  }
-}

.vscode/settings.json

@@ -1,13 +1,3 @@
 {
-  "cSpell.words": [
+  "cSpell.words": ["hifi", "rescrobbler", "widevine"]
-    "flac",
-    "geqnfr",
-    "hifi",
-    "playpause",
-    "rescrobbler",
-    "trackid",
-    "tracklist",
-    "widevine",
-    "xesam"
-  ]
 }

CHANGELOG.md

@@ -4,35 +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.2.0
-
-- moved from Javascript to Typescript for all files
-  - use `npm run watch` to watch for changes & recompile typescript and sass files
-
-- Added support for theming the application
-
-## 5.1.0
-
-### New features
-
-- Added proper updates through the MediaSession API
-- You can now add custom CSS in the "advanced" settings tab
-- You can now configure the updateFrequency in the settings window
-  - Default value is set to 500 and will overwrite the hardcoded value of 100
-
-### Fixes
-
-- Any songs **including** an artist listed in the `skipped artists` setting will now be skipped even if the song is a collaboration.
-- Linux desktop icons have been fixed. See [#222](https://github.com/Mastermindzh/tidal-hifi/pull/222) for details.
-
-## 5.0.0
-
-- Replaced "muting artists" with a full implementation of an Adblock mechanism
-
-  > Disabled audio & visual ads, unlocked lyrics, suggested track, track info, unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
-
-- @thanasistrisp updated Electron to 24.1.2 and fixed the tray bug :)
-
 ## 4.4.0
 
 - Updated shortcut hint on the menubar to reflect the new `ctrl+=` shortcut.

README.md

@@ -1,81 +1,39 @@
-# Tidal-hifi<img src = "./build/icon.png" height="40" align="right"/>
+<h1>
-
+Tidal-hifi
-![GitHub release](https://img.shields.io/github/release/Mastermindzh/tidal-hifi.svg) [![Discord logo](./docs/images/discord.png)](https://discord.gg/yhNwf4v4He)
+<img src = "./build/icon.png" height="40" align="right" />
+</h1>
 
 The web version of [listen.tidal.com](https://listen.tidal.com) running in electron with hifi support thanks to widevine.
 
-![tidal-hifi preview](./docs/images/preview.png)
+![tidal-hifi preview](./docs/preview.png)
 
-## Table of Contents
+## Table of contents
 
 <!-- toc -->
 
-- [Tidal-hifi](#tidal-hifi)
+- [Installation](#installation)
-  - [Table of Contents](#table-of-contents)
+  * [Using releases](#using-releases)
-  - [Features](#features)
+  * [Snap](#snap)
-  - [Contributions](#contributions)
+  * [Arch Linux](#arch-linux)
-  - [Why did I create tidal-hifi?](#why-did-i-create-tidal-hifi)
+  * [Flatpak](#flatpak)
-    - [Why not extend existing projects?](#why-not-extend-existing-projects)
+  * [Nix](#nix)
-  - [Installation](#installation)
+  * [Using source](#using-source)
-    - [Dependencies](#dependencies)
+- [Features](#features)
-    - [Using releases](#using-releases)
+- [Integrations](#integrations)
-    - [Snap](#snap)
+  * [Known bugs](#known-bugs)
-    - [Arch Linux](#arch-linux)
+    + [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)
-    - [Flatpak](#flatpak)
+- [Why](#why)
-    - [Nix](#nix)
+- [Why not extend existing projects?](#why-not-extend-existing-projects)
-    - [Using source](#using-source)
+- [Special thanks to...](#special-thanks-to)
-  - [Integrations](#integrations)
+- [Buy me a coffee? Please don't](#buy-me-a-coffee-please-dont)
-    - [Known bugs](#known-bugs)
+- [Images](#images)
-      - [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)
+  * [Settings window](#settings-window)
-  - [Special thanks to](#special-thanks-to)
+  * [User setups](#user-setups)
-  - [Donations](#donations)
-  - [Images](#images)
-    - [Settings window](#settings-window)
-    - [User setups](#user-setups)
 
 <!-- tocstop -->
 
-## Features
-
-- HiFi playback
-- Notifications
-- Custom [theming](./docs/theming.md)
-- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
-- API for status and playback
-- Disabled audio & visual ads, unlocked lyrics, suggested track, track info, and unlimited skips thanks to uBlockOrigin custom filters ([source](https://github.com/uBlockOrigin/uAssets/issues/17495))
-- Custom [integrations](#integrations)
-- [Settings feature](./docs/images/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
-- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
-
-## Contributions
-
-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-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.
-
-### Why not extend existing projects?
-
-Whilst there are a handful of projects attempting to run Tidal on Electron they are all unappealing to me because of various reasons:
-
-- Lack of maintainers/developers. (no hotfixes, no issues being handled etc)
-- Most are simple web wrappers, not my cup of tea.
-- Some are DE oriented. I want this to work on WM's too.
-- None have widevine working at the moment
-
-Sometimes it's just easier to start over, cover my own needs and then making it available to the public :)
-
 ## Installation
 
-### Dependencies
-
-Note that you **need** a notification library such as [libnotify](https://github.com/GNOME/libnotify) or [dunst](https://github.com/dunst-project/dunst) for the software to work properly.
-
 ### Using releases
 
 Various packaged versions of the software are available on the [releases](https://github.com/Mastermindzh/tidal-hifi/releases) tab.
@@ -86,15 +44,15 @@ To install with `snap` you need to download the pre-packaged snap-package from t
 
 1. Download
 
-    ```sh
+```sh
-    wget <URI> #for instance: https://github.com/Mastermindzh/tidal-hifi/releases/download/1.0/tidal-hifi_1.0.0_amd64.snap
+wget <URI> #for instance: https://github.com/Mastermindzh/tidal-hifi/releases/download/1.0/tidal-hifi_1.0.0_amd64.snap
-    ```
+```
 
 2. Install
 
-    ```sh
+```sh
-    snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
+snap install --dangerous <path> #for instance: tidal-hifi_1.0.0_amd64.snap
-    ```
+```
 
 ### Arch Linux
 
@@ -129,12 +87,23 @@ To install and work with the code on this project follow these steps:
 - npm install
 - npm start
 
+## Features
+
+- HiFi playback
+- Notifications
+- Custom hotkeys ([source](https://defkey.com/tidal-desktop-shortcuts))
+- API for status and playback
+- [Mute artists automatically (defaults to "Tidal")]("./docs/muting-artists.md")
+- Custom [integrations](#integrations)
+- [Settings feature](./docs/settings.png) to disable certain functionality. (`ctrl+=` or `ctrl+0`)
+- AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
+
 ## Integrations
 
 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 menu, showing a list of integrations](./docs/integrations.png)
 
 It currently includes:
 
@@ -153,20 +122,38 @@ The last.fm login doesn't work, as is evident from the following issue: [Last.fm
 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.
 
-## Special thanks to
+## Why
+
+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.
+
+## Why not extend existing projects?
+
+Whilst there are a handful of projects attempting to run Tidal on Electron they are all unappealing to me because of various reasons:
+
+- Lack of a maintainers/developers. (no hotfixes, no issues being handled etc)
+- Most are simple web wrappers, not my cup of tea.
+- Some are DE oriented. I want this to work on WM's too.
+- None have widevine working at the moment
+
+Sometimes it's just easier to start over, cover my own needs and then making it available to the public :)
+
+## Special thanks to...
 
 - [Castlabs](https://castlabs.com/)
   For maintaining Electron with Widevine CDM installation, Verified Media Path (VMP), and persistent licenses (StorageID)
 
-## Donations
+## Buy me a coffee? Please don't
 
-You can find my Github sponsorship page at: [https://github.com/sponsors/Mastermindzh](https://github.com/sponsors/Mastermindzh)
+Instead spend some money on a charity I care for: [kwf.nl](https://www.kwf.nl/donatie/donation).
+Inspired by [haydenjames' issue](https://github.com/Mastermindzh/tidal-hifi/issues/27#issuecomment-704198429)
 
 ## Images
 
 ### Settings window
 
-![settings window](./docs/images/settings-preview.png)
+![settings window](./docs/settings-preview.png)
 
 ### User setups
 

build/electron-builder.base.yml

@@ -1,17 +1,15 @@
 appId: com.rickvanlieshout.tidal-hifi
-electronVersion: 24.1.2
+electronVersion: 19.0.5
 electronDownload:
-  version: 24.1.2+wvcus
+  version: 19.0.5+wvcus
   mirror: https://github.com/castlabs/electron-releases/releases/download/v
 snap:
   plugs:
     - default
     - screen-inhibit-control
-extraResources:
-  - "themes/**"
 linux:
   category: AudioVideo
-  icon: assets/icons
+  icon: icon.png
   target:
     - dir
   executableName: tidal-hifi
@@ -20,7 +18,7 @@ linux:
     Name: TIDAL Hi-Fi
     GenericName: TIDAL Hi-Fi
     Comment: The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
-    Icon: tidal-hifi
+    Icon: icon.png
     StartupNotify: true
     Terminal: false
     Type: Application

build/electron-builder.pacman.yml

@@ -1,4 +1,5 @@
 extends: ./build/electron-builder.base.yml
 linux:
+  icon: icon.png
   target:
     - pacman

docs/muting-artists.md

@@ -0,0 +1,11 @@
+# Muting artists
+
+If you feel that some of your music is embarrassing for others you can mute specific artists in the settings window.
+This functionality is inspired by the [adblock ticket](https://github.com/Mastermindzh/tidal-hifi/issues/112), and whilst I personally feel you should simply buy Tidal, I also believe in muting sound that you don't want to hear.
+
+Anyway, to block an artist, open the settings window (see image below) and enter a list of artists in the textarea as seen below.
+Don't forget to turn the feature on and Tidal-hifi will automatically mute the player whenever that artist is playing.
+
+This will allow you to skip the song without anyone noticing. (you can always say "no idea, it seems to have no audio").
+
+![muted artists settings window](./settings-muted-artists.png)

docs/theming.md

@@ -1,38 +0,0 @@
-# Theming tidal-hifi
-
-## Table of contents
-
-<!-- toc -->
-
-- [Theming tidal-hifi](#theming-tidal-hifi)
-  - [Table of contents](#table-of-contents)
-  - [Custom CSS](#custom-css)
-  - [config](#config)
-  - [Warning! Themes might break](#warning-themes-might-break)
-
-<!-- tocstop -->
-
-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)
-
-## Custom CSS
-
-The custom CSS will be added to the HTML document last.
-This means that it will overwrite any existing CSS, even that of themes, unless the original has an access modifier such as `$important`.
-
-![settings window on the theming tab with a custom CSS override](./images/customcss.png)
-
-## config
-
-The theme selector and customCSS are stored in the config file.
-The custom CSS is stored as a list of lines.
-
-![settings window on the theming tab next to the config file](./images/customcss-config.png)
-
-## Warning! Themes might break
-
-Themes might break at any point. Tidal changes their webpage structure a ton (they probably generate classNames and don't provide roles/ids/attributes.)
-
-If one breaks you can create an Issue on GitHub or ask for assistance in the [Discord channel](https://discord.gg/yhNwf4v4He).

package.json

@@ -1,15 +1,10 @@
 {
   "name": "tidal-hifi",
-  "version": "5.2.0",
+  "version": "4.4.0",
   "description": "Tidal on Electron with widevine(hifi) support",
-  "main": "ts-dist/main.js",
+  "main": "src/main.js",
   "scripts": {
     "start": "electron .",
-    "compile": "tsc && npm run sass-and-copy",
-    "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",
-    "sass-and-copy": "npm run sass && npm run copy-files && npm run copy-themes-dev",
     "build": "npm run builder -- -c ./build/electron-builder.yml",
     "build-deb": "npm run builder -- -c ./build/electron-builder.deb.yml",
     "build-unpacked": "npm run builder -- -c ./build/electron-builder.unpacked.yml",
@@ -19,11 +14,12 @@
     "build-wl": "npm run builder -- -c ./build/electron-builder.yml -wl",
     "build-mac": "npm run builder -- -c ./build/electron-builder.yml -m",
     "build-base": "npm run builder -- -c ./build/electron-builder.base.yml",
-    "prebuilder": "npm run compile",
+    "prestart": "npm run sass",
+    "prebuilder": "npm run sass",
     "builder": "electron-builder --publish=never",
-    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
+    "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css",
-    "style-lint": "npx stylelint **/*.scss",
+    "sass-lint": "sass-lint -vc ./sass-lint.yml ./src/pages/settings/settings.scss",
-    "style-lint-fix": "npx stylelint --fix **/*.scss"
+    "sass-lint-fix": "sass-lint-auto-fix ./src/pages/settings/settings.scss --config-sass-lint ./sass-lint.yml"
   },
   "keywords": [
     "electron",
@@ -35,35 +31,23 @@
   "homepage": "https://github.com/Mastermindzh/tidal-hifi",
   "license": "MIT",
   "dependencies": {
-    "@electron/remote": "^2.0.9",
+    "@electron/remote": "^2.0.8",
     "discord-rpc": "^4.0.1",
     "electron-store": "^8.1.0",
-    "express": "^4.18.2",
+    "express": "^4.18.1",
-    "hotkeys-js": "^3.10.2",
+    "hotkeys-js": "^3.9.4",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
-    "sass": "^1.62.0"
+    "sass": "^1.54.9"
   },
   "devDependencies": {
     "@mastermindzh/prettier-config": "^1.0.0",
-    "@types/discord-rpc": "^4.0.4",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#v19.0.5+wvcus",
-    "@types/express": "^4.17.17",
+    "electron-builder": "^23.3.3",
-    "@types/request": "^2.48.8",
+    "js-yaml": "^3.14.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "prettier": "^2.7.1",
-    "@typescript-eslint/parser": "^5.59.1",
+    "sass-lint": "^1.13.1",
-    "copyfiles": "^2.4.1",
+    "sass-lint-auto-fix": "^0.21.2"
-    "electron": "git+https://github.com/castlabs/electron-releases.git#v24.1.2+wvcus",
-    "electron-builder": "^24.2.1",
-    "eslint": "^8.39.0",
-    "js-yaml": "^4.1.0",
-    "markdown-toc": "^1.2.0",
-    "prettier": "^2.8.8",
-    "stylelint": "^15.6.0",
-    "stylelint-config-standard": "^33.0.0",
-    "stylelint-config-standard-scss": "^9.0.0",
-    "stylelint-prettier": "^3.0.0",
-    "tsc-watch": "^6.0.4",
-    "typescript": "^5.0.4"
   },
   "prettier": "@mastermindzh/prettier-config"
 }

sass-lint.yml

@@ -0,0 +1,21 @@
+rules:
+  property-sort-order:
+    - 1
+    - order: "smacss"
+  class-name-format:
+    - 1
+    - convention: "hyphenatedbem"
+  quotes:
+    - 1
+    - style: "double"
+  nesting-depth:
+    - 1
+    - max-depth: 3
+  placeholder-in-extend:
+    - 0
+  no-vendor-prefixes:
+    - 0
+  empty-line-between-blocks:
+    - 0
+  force-pseudo-nesting:
+    - 0

src/constants/flags.js

@@ -1,4 +1,6 @@
-export const flags: { [key: string]: { flag: string; value?: string }[] } = {
+const flags = {
   gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
   disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
 };
+
+module.exports = flags;

src/constants/globalEvents.js

@@ -1,4 +1,4 @@
-export const globalEvents = {
+const globalEvents = {
   play: "play",
   pause: "pause",
   playPause: "playPause",
@@ -11,3 +11,5 @@ export const globalEvents = {
   storeChanged: "storeChanged",
   error: "error",
 };
+
+module.exports = globalEvents;

src/constants/mediaKeys.js

@@ -1,7 +1,9 @@
-import { globalEvents } from "./globalEvents";
+const globalEvents = require("./globalEvents");
 
-export const mediaKeys = {
+const mediaKeys = {
   MediaPlayPause: globalEvents.playPause,
   MediaNextTrack: globalEvents.next,
   MediaPreviousTrack: globalEvents.previous,
 };
+
+module.exports = mediaKeys;

src/constants/settings.js

@@ -8,37 +8,36 @@
  *    },
  *    windowBounds: { width: 800, height: 600 },
  */
-export const settings = {
+const settings = {
-  adBlock: "adBlock",
+  notifications: "notifications",
   api: "api",
+  menuBar: "menuBar",
+  playBackControl: "playBackControl",
+  muteArtists: "muteArtists",
+  mutedArtists: "mutedArtists",
+  skipArtists: "skipArtists",
+  skippedArtists: "skippedArtists",
+  disableBackgroundThrottle: "disableBackgroundThrottle",
   apiSettings: {
     root: "apiSettings",
     port: "apiSettings.port",
   },
-  customCSS: "customCSS",
+  singleInstance: "singleInstance",
-  disableBackgroundThrottle: "disableBackgroundThrottle",
   disableHardwareMediaKeys: "disableHardwareMediaKeys",
-  enableCustomHotkeys: "enableCustomHotkeys",
-  enableDiscord: "enableDiscord",
   flags: {
-    root: "flags",
     disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
     gpuRasterization: "flags.gpuRasterization",
   },
-  menuBar: "menuBar",
-  minimizeOnClose: "minimizeOnClose",
   mpris: "mpris",
-  notifications: "notifications",
+  enableCustomHotkeys: "enableCustomHotkeys",
-  playBackControl: "playBackControl",
-  singleInstance: "singleInstance",
-  skipArtists: "skipArtists",
-  skippedArtists: "skippedArtists",
-  theme: "theme",
   trayIcon: "trayIcon",
-  updateFrequency: "updateFrequency",
+  enableDiscord: "enableDiscord",
   windowBounds: {
     root: "windowBounds",
     width: "windowBounds.width",
     height: "windowBounds.height",
   },
+  minimizeOnClose: "minimizeOnClose",
 };
+
+module.exports = settings;

src/constants/statuses.js

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

src/constants/values.js

@@ -1,3 +1,3 @@
-export default {
+module.exports = {
   name: "tidal-hifi",
 };

src/declarations.d.ts

@@ -1 +0,0 @@
-declare module "mpris-service";

src/main.js

@@ -1,47 +1,36 @@
-import { enable, initialize } from "@electron/remote/main";
+require("@electron/remote/main").initialize();
-import {
+const { app, BrowserWindow, components, globalShortcut, ipcMain, protocol } = require("electron");
-  BrowserWindow,
+const {
-  app,
+  settings,
-  components,
+  store,
-  globalShortcut,
-  ipcMain,
-  protocol,
-  session,
-} from "electron";
-import path from "path";
-import { flags } from "./constants/flags";
-import { globalEvents } from "./constants/globalEvents";
-import { mediaKeys } from "./constants/mediaKeys";
-import { initRPC, rpc, unRPC } from "./scripts/discord";
-import { startExpress } from "./scripts/express";
-import { updateMediaInfo } from "./scripts/mediaInfo";
-import { addMenu } from "./scripts/menu";
-import {
-  closeSettingsWindow,
   createSettingsWindow,
-  hideSettingsWindow,
   showSettingsWindow,
-  settingsStore,
+  closeSettingsWindow,
-} from "./scripts/settings";
+  hideSettingsWindow,
-import { settings } from "./constants/settings";
+} = require("./scripts/settings");
-import { addTray, refreshTray } from "./scripts/tray";
+const { addTray, refreshTray } = require("./scripts/tray");
-import { MediaInfo } from "./models/mediaInfo";
+const { addMenu } = require("./scripts/menu");
+const path = require("path");
 const tidalUrl = "https://listen.tidal.com";
+const expressModule = require("./scripts/express");
+const mediaKeys = require("./constants/mediaKeys");
+const mediaInfoModule = require("./scripts/mediaInfo");
+const discordModule = require("./scripts/discord");
+const globalEvents = require("./constants/globalEvents");
+const flagValues = require("./constants/flags");
 
-initialize();
+let mainWindow;
-
+let icon = path.join(__dirname, "../assets/icon.png");
-let mainWindow: BrowserWindow;
-const icon = path.join(__dirname, "../assets/icon.png");
 const PROTOCOL_PREFIX = "tidal";
 
 setFlags();
 
 function setFlags() {
-  const flagsFromSettings = settingsStore.get(settings.flags.root);
+  const flags = store.get().flags;
-  if (flagsFromSettings) {
+  if (flags) {
     for (const [key, value] of Object.entries(flags)) {
       if (value) {
-        flags[key].forEach((flag) => {
+        flagValues[key].forEach((flag) => {
           console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
           app.commandLine.appendSwitch(flag.flag, flag.value);
         });
@@ -60,7 +49,7 @@ function setFlags() {
  *
  */
 function syncMenuBarWithStore() {
-  const fixedMenuBar = !!settingsStore.get(settings.menuBar);
+  const fixedMenuBar = store.get(settings.menuBar);
 
   mainWindow.autoHideMenuBar = !fixedMenuBar;
   mainWindow.setMenuBarVisibility(fixedMenuBar);
@@ -73,7 +62,7 @@ function syncMenuBarWithStore() {
  * @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
  */
 function isMainInstanceOrMultipleInstancesAllowed() {
-  if (settingsStore.get(settings.singleInstance)) {
+  if (store.get(settings.singleInstance)) {
     const gotTheLock = app.requestSingleInstanceLock();
 
     if (!gotTheLock) {
@@ -83,37 +72,39 @@ function isMainInstanceOrMultipleInstancesAllowed() {
   return true;
 }
 
-function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
+function createWindow(options = {}) {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     x: options.x,
     y: options.y,
-    width: settingsStore && settingsStore.get(settings.windowBounds.width),
+    width: store && store.get(settings.windowBounds.width),
-    height: settingsStore && settingsStore.get(settings.windowBounds.height),
+    height: store && store.get(settings.windowBounds.height),
     icon,
     backgroundColor: options.backgroundColor,
     autoHideMenuBar: true,
     webPreferences: {
-      sandbox: false,
       preload: path.join(__dirname, "preload.js"),
       plugins: true,
       devTools: true, // I like tinkering, others might too
     },
   });
-  enable(mainWindow.webContents);
+  require("@electron/remote/main").enable(mainWindow.webContents);
   registerHttpProtocols();
   syncMenuBarWithStore();
 
   // load the Tidal website
   mainWindow.loadURL(tidalUrl);
 
-  if (settingsStore.get(settings.disableBackgroundThrottle)) {
+  if (store.get(settings.disableBackgroundThrottle)) {
     // prevent setInterval lag
     mainWindow.webContents.setBackgroundThrottling(false);
   }
 
-  mainWindow.on("close", function (event: CloseEvent) {
+  // run stuff after first load
-    if (settingsStore.get(settings.minimizeOnClose)) {
+  mainWindow.webContents.once("did-finish-load", () => {});
+
+  mainWindow.on("close", function (event) {
+    if (!app.isQuiting && store.get(settings.minimizeOnClose)) {
       event.preventDefault();
       mainWindow.hide();
       refreshTray(mainWindow);
@@ -126,13 +117,14 @@ function createWindow(options = { x: 0, y: 0, backgroundColor: "white" }) {
     app.quit();
   });
   mainWindow.on("resize", () => {
-    const { width, height } = mainWindow.getBounds();
+    let { width, height } = mainWindow.getBounds();
-    settingsStore.set(settings.windowBounds.root, { width, height });
+
+    store.set(settings.windowBounds.root, { width, height });
   });
 }
 
 function registerHttpProtocols() {
-  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request) => {
+  protocol.registerHttpProtocol(PROTOCOL_PREFIX, (request, _callback) => {
     mainWindow.loadURL(`${tidalUrl}/${request.url.substring(PROTOCOL_PREFIX.length + 3)}`);
   });
   if (!app.isDefaultProtocolClient(PROTOCOL_PREFIX)) {
@@ -143,7 +135,7 @@ function registerHttpProtocols() {
 function addGlobalShortcuts() {
   Object.keys(mediaKeys).forEach((key) => {
     globalShortcut.register(`${key}`, () => {
-      mainWindow.webContents.send("globalEvent", `${(mediaKeys as any)[key]}`);
+      mainWindow.webContents.send("globalEvent", `${mediaKeys[key]}`);
     });
   });
 }
@@ -154,26 +146,14 @@ function addGlobalShortcuts() {
 app.on("ready", async () => {
   if (isMainInstanceOrMultipleInstancesAllowed()) {
     await components.whenReady();
-
-    // Adblock
-    if (settingsStore.get(settings.adBlock)) {
-      const filter = { urls: ["https://listen.tidal.com/*"] };
-      session.defaultSession.webRequest.onBeforeRequest(filter, (details, callback) => {
-        if (details.url.match(/\/users\/.*\d\?country/)) callback({ cancel: true });
-        else callback({ cancel: false });
-      });
-    }
-
     createWindow();
     addMenu(mainWindow);
     createSettingsWindow();
     addGlobalShortcuts();
-    if (settingsStore.get(settings.trayIcon)) {
+    store.get(settings.trayIcon) && addTray(mainWindow, { icon }) && refreshTray();
-      addTray(mainWindow, { icon });
+    store.get(settings.api) && expressModule.run(mainWindow);
-      refreshTray(mainWindow);
+    store.get(settings.enableDiscord) && discordModule.initRPC();
-    }
+    // mainWindow.webContents.openDevTools();
-    settingsStore.get(settings.api) && startExpress(mainWindow);
-    settingsStore.get(settings.enableDiscord) && initRPC();
   } else {
     app.quit();
   }
@@ -188,35 +168,35 @@ app.on("activate", function () {
 });
 
 app.on("browser-window-created", (_, window) => {
-  enable(window.webContents);
+  require("@electron/remote/main").enable(window.webContents);
 });
 
 // IPC
-ipcMain.on(globalEvents.updateInfo, (_event, arg: MediaInfo) => {
+ipcMain.on(globalEvents.updateInfo, (_event, arg) => {
-  updateMediaInfo(arg);
+  mediaInfoModule.update(arg);
 });
 
-ipcMain.on(globalEvents.hideSettings, () => {
+ipcMain.on(globalEvents.hideSettings, (_event, _arg) => {
   hideSettingsWindow();
 });
-ipcMain.on(globalEvents.showSettings, () => {
+ipcMain.on(globalEvents.showSettings, (_event, _arg) => {
   showSettingsWindow();
 });
 
-ipcMain.on(globalEvents.refreshMenuBar, () => {
+ipcMain.on(globalEvents.refreshMenuBar, (_event, _arg) => {
   syncMenuBarWithStore();
 });
 
-ipcMain.on(globalEvents.storeChanged, () => {
+ipcMain.on(globalEvents.storeChanged, (_event, _arg) => {
   syncMenuBarWithStore();
 
-  if (settingsStore.get(settings.enableDiscord) && !rpc) {
+  if (store.get(settings.enableDiscord) && !discordModule.rpc) {
-    initRPC();
+    discordModule.initRPC();
-  } else if (!settingsStore.get(settings.enableDiscord) && rpc) {
+  } else if (!store.get(settings.enableDiscord) && discordModule.rpc) {
-    unRPC();
+    discordModule.unRPC();
   }
 });
 
-ipcMain.on(globalEvents.error, (event) => {
+ipcMain.on(globalEvents.error, (event, _arg) => {
   console.log(event);
 });

src/models/mediaInfo.ts

@@ -1,13 +0,0 @@
-import { MediaStatus } from "./mediaStatus";
-
-export interface MediaInfo {
-  title: string;
-  artists: string;
-  album: string;
-  icon: string;
-  status: MediaStatus;
-  url: string;
-  current: string;
-  duration: string;
-  image: string;
-}

src/models/mediaStatus.ts

@@ -1,4 +0,0 @@
-export enum MediaStatus {
-  playing = "playing",
-  paused = "paused",
-}

src/models/options.ts

@@ -1,12 +0,0 @@
-export interface Options {
-  title: string;
-  artists: string;
-  album: string;
-  status: string;
-  url: string;
-  current: string;
-  duration: string;
-  "app-name": string;
-  image: string;
-  icon: string;
-}

src/pages/settings/preload.js

@@ -0,0 +1,153 @@
+let trayIcon,
+  minimizeOnClose,
+  mpris,
+  enableCustomHotkeys,
+  enableDiscord,
+  muteArtists,
+  skipArtists,
+  notifications,
+  playBackControl,
+  api,
+  port,
+  menuBar,
+  mutedArtists,
+  skippedArtists,
+  disableBackgroundThrottle,
+  singleInstance,
+  disableHardwareMediaKeys,
+  gpuRasterization;
+
+const { store, settings } = require("./../../scripts/settings");
+const { ipcRenderer } = require("electron");
+const globalEvents = require("./../../constants/globalEvents");
+const remote = require("@electron/remote");
+const { app } = remote;
+/**
+ * Sync the UI forms with the current settings
+ */
+function refreshSettings() {
+  notifications.checked = store.get(settings.notifications);
+  playBackControl.checked = store.get(settings.playBackControl);
+  api.checked = store.get(settings.api);
+  port.value = store.get(settings.apiSettings.port);
+  menuBar.checked = store.get(settings.menuBar);
+  trayIcon.checked = store.get(settings.trayIcon);
+  mpris.checked = store.get(settings.mpris);
+  enableCustomHotkeys.checked = store.get(settings.enableCustomHotkeys);
+  enableDiscord.checked = store.get(settings.enableDiscord);
+  minimizeOnClose.checked = store.get(settings.minimizeOnClose);
+  muteArtists.checked = store.get(settings.muteArtists);
+  mutedArtists.value = store.get(settings.mutedArtists).join("\n");
+  skipArtists.checked = store.get(settings.skipArtists);
+  skippedArtists.value = store.get(settings.skippedArtists).join("\n");
+  singleInstance.checked = store.get(settings.singleInstance);
+  disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
+  gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
+  disableBackgroundThrottle.checked = store.get("disableBackgroundThrottle");
+}
+
+/**
+ * Open an url in the default browsers
+ */
+function openExternal(url) {
+  const { shell } = require("electron");
+  shell.openExternal(url);
+}
+
+/**
+ * hide the settings window
+ */
+function hide() {
+  ipcRenderer.send(globalEvents.hideSettings);
+}
+
+/**
+ * Restart tidal-hifi after changes
+ */
+function restart() {
+  app.relaunch();
+  app.quit();
+}
+
+/**
+ * Bind UI components to functions after DOMContentLoaded
+ */
+window.addEventListener("DOMContentLoaded", () => {
+  function get(id) {
+    return document.getElementById(id);
+  }
+
+  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.getAttribute("data-url"));
+    })
+  );
+
+  function addInputListener(source, key) {
+    source.addEventListener("input", function (_event, _data) {
+      if (this.value === "on") {
+        store.set(key, source.checked);
+      } else {
+        store.set(key, this.value);
+      }
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
+  function addTextAreaListener(source, key) {
+    source.addEventListener("input", function (_event, _data) {
+      store.set(key, source.value.split("\n"));
+      ipcRenderer.send(globalEvents.storeChanged);
+    });
+  }
+
+  ipcRenderer.on("refreshData", () => {
+    refreshSettings();
+  });
+
+  ipcRenderer.on("goToTab", (_, tab) => {
+    document.getElementById(tab).click();
+  });
+
+  notifications = get("notifications");
+  playBackControl = get("playBackControl");
+  api = get("apiCheckbox");
+  port = get("port");
+  menuBar = get("menuBar");
+  trayIcon = get("trayIcon");
+  minimizeOnClose = get("minimizeOnClose");
+  mpris = get("mprisCheckbox");
+  enableCustomHotkeys = get("enableCustomHotkeys");
+  enableDiscord = get("enableDiscord");
+  muteArtists = get("muteArtists");
+  mutedArtists = get("mutedArtists");
+  skipArtists = get("skipArtists");
+  skippedArtists = get("skippedArtists");
+  disableBackgroundThrottle = get("disableBackgroundThrottle");
+  singleInstance = get("singleInstance");
+  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
+  gpuRasterization = get("gpuRasterization");
+
+  refreshSettings();
+
+  addInputListener(notifications, settings.notifications);
+  addInputListener(playBackControl, settings.playBackControl);
+  addInputListener(api, settings.api);
+  addInputListener(port, settings.apiSettings.port);
+  addInputListener(menuBar, settings.menuBar);
+  addInputListener(trayIcon, settings.trayIcon);
+  addInputListener(mpris, settings.mpris);
+  addInputListener(enableCustomHotkeys, settings.enableCustomHotkeys);
+  addInputListener(enableDiscord, settings.enableDiscord);
+  addInputListener(minimizeOnClose, settings.minimizeOnClose);
+  addInputListener(muteArtists, settings.muteArtists);
+  addTextAreaListener(mutedArtists, settings.mutedArtists);
+  addInputListener(skipArtists, settings.skipArtists);
+  addTextAreaListener(skippedArtists, settings.skippedArtists);
+  addInputListener(disableBackgroundThrottle, settings.disableBackgroundThrottle);
+  addInputListener(singleInstance, settings.singleInstance);
+  addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
+  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
+});

src/pages/settings/preload.ts

@@ -1,209 +0,0 @@
-import remote, { app } from "@electron/remote";
-import { ipcRenderer, shell } from "electron";
-import fs from "fs";
-import { globalEvents } from "../../constants/globalEvents";
-import { settings } from "../../constants/settings";
-import { settingsStore } from "./../../scripts/settings";
-import { getOptions, getOptionsHeader, getThemeListFromDirectory } from "./theming";
-
-let adBlock: HTMLInputElement,
-  api: HTMLInputElement,
-  customCSS: HTMLInputElement,
-  disableBackgroundThrottle: HTMLInputElement,
-  disableHardwareMediaKeys: HTMLInputElement,
-  enableCustomHotkeys: HTMLInputElement,
-  enableDiscord: HTMLInputElement,
-  gpuRasterization: HTMLInputElement,
-  menuBar: HTMLInputElement,
-  minimizeOnClose: HTMLInputElement,
-  mpris: HTMLInputElement,
-  notifications: HTMLInputElement,
-  playBackControl: HTMLInputElement,
-  port: HTMLInputElement,
-  singleInstance: HTMLInputElement,
-  skipArtists: HTMLInputElement,
-  skippedArtists: HTMLInputElement,
-  theme: HTMLSelectElement,
-  trayIcon: HTMLInputElement,
-  updateFrequency: HTMLInputElement;
-function getThemeFiles() {
-  const selectElement = document.getElementById("themesList") as HTMLSelectElement;
-  const builtInThemes = getThemeListFromDirectory(process.resourcesPath);
-  const userThemes = getThemeListFromDirectory(`${app.getPath("userData")}/themes`);
-
-  let allThemes = [
-    getOptionsHeader("Built-in Themes"),
-    new Option("Tidal - Default", "none"),
-  ].concat(getOptions(builtInThemes));
-
-  if (userThemes.length >= 1) {
-    allThemes = allThemes.concat([getOptionsHeader("User Themes")]).concat(getOptions(userThemes));
-  }
-
-  // empty old options
-  const oldOptions = document.querySelectorAll("#themesList option");
-  oldOptions.forEach((o) => o.remove());
-
-  allThemes.forEach((option) => {
-    selectElement.add(option, null);
-  });
-}
-
-function handleFileUploads() {
-  const fileMessage = document.getElementById("file-message");
-  fileMessage.innerText = "or drag and drop files here";
-
-  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}`;
-      fs.copyFileSync(file.path, destination, null);
-    });
-    fileMessage.innerText = `${e.target.files.length} files successfully uploaded`;
-    getThemeFiles();
-  });
-}
-
-/**
- * Sync the UI forms with the current settings
- */
-function refreshSettings() {
-  adBlock.checked = settingsStore.get(settings.adBlock);
-  api.checked = settingsStore.get(settings.api);
-  customCSS.value = settingsStore.get<string, string[]>(settings.customCSS).join("\n");
-  disableBackgroundThrottle.checked = settingsStore.get(settings.disableBackgroundThrottle);
-  disableHardwareMediaKeys.checked = settingsStore.get(settings.flags.disableHardwareMediaKeys);
-  enableCustomHotkeys.checked = settingsStore.get(settings.enableCustomHotkeys);
-  enableDiscord.checked = settingsStore.get(settings.enableDiscord);
-  gpuRasterization.checked = settingsStore.get(settings.flags.gpuRasterization);
-  menuBar.checked = settingsStore.get(settings.menuBar);
-  minimizeOnClose.checked = settingsStore.get(settings.minimizeOnClose);
-  mpris.checked = settingsStore.get(settings.mpris);
-  notifications.checked = settingsStore.get(settings.notifications);
-  playBackControl.checked = settingsStore.get(settings.playBackControl);
-  port.value = settingsStore.get(settings.apiSettings.port);
-  singleInstance.checked = settingsStore.get(settings.singleInstance);
-  skipArtists.checked = settingsStore.get(settings.skipArtists);
-  theme.value = settingsStore.get(settings.theme);
-  skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
-  trayIcon.checked = settingsStore.get(settings.trayIcon);
-  updateFrequency.value = settingsStore.get(settings.updateFrequency);
-}
-
-/**
- * Open an url in the default browsers
- */
-function openExternal(url: string) {
-  shell.openExternal(url);
-}
-
-/**
- * hide the settings window
- */
-function hide() {
-  ipcRenderer.send(globalEvents.hideSettings);
-}
-
-/**
- * Restart tidal-hifi after changes
- */
-function restart() {
-  remote.app.relaunch();
-  remote.app.exit();
-}
-
-/**
- * Bind UI components to functions after DOMContentLoaded
- */
-window.addEventListener("DOMContentLoaded", () => {
-  function get<T = HTMLInputElement>(id: string): T {
-    return document.getElementById(id) as T;
-  }
-
-  getThemeFiles();
-  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(source: HTMLInputElement, key: string) {
-    source.addEventListener("input", () => {
-      if (source.value === "on") {
-        settingsStore.set(key, source.checked);
-      } else {
-        settingsStore.set(key, source.value);
-      }
-      ipcRenderer.send(globalEvents.storeChanged);
-    });
-  }
-
-  function addTextAreaListener(source: HTMLInputElement, key: string) {
-    source.addEventListener("input", () => {
-      settingsStore.set(key, source.value.split("\n"));
-      ipcRenderer.send(globalEvents.storeChanged);
-    });
-  }
-
-  function addSelectListener(source: HTMLSelectElement, key: string) {
-    source.addEventListener("change", () => {
-      settingsStore.set(key, source.value);
-      ipcRenderer.send(globalEvents.storeChanged);
-    });
-  }
-
-  ipcRenderer.on("refreshData", () => {
-    refreshSettings();
-  });
-
-  ipcRenderer.on("goToTab", (_, tab) => {
-    document.getElementById(tab).click();
-  });
-
-  adBlock = get("adBlock");
-  api = get("apiCheckbox");
-  customCSS = get("customCSS");
-  disableBackgroundThrottle = get("disableBackgroundThrottle");
-  disableHardwareMediaKeys = get("disableHardwareMediaKeys");
-  enableCustomHotkeys = get("enableCustomHotkeys");
-  enableDiscord = get("enableDiscord");
-  gpuRasterization = get("gpuRasterization");
-  menuBar = get("menuBar");
-  minimizeOnClose = get("minimizeOnClose");
-  mpris = get("mprisCheckbox");
-  notifications = get("notifications");
-  playBackControl = get("playBackControl");
-  port = get("port");
-  theme = get<HTMLSelectElement>("themesList");
-  trayIcon = get("trayIcon");
-  skipArtists = get("skipArtists");
-  skippedArtists = get("skippedArtists");
-  singleInstance = get("singleInstance");
-  updateFrequency = get("updateFrequency");
-
-  refreshSettings();
-
-  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);
-  addInputListener(gpuRasterization, settings.flags.gpuRasterization);
-  addInputListener(menuBar, settings.menuBar);
-  addInputListener(minimizeOnClose, settings.minimizeOnClose);
-  addInputListener(mpris, settings.mpris);
-  addInputListener(notifications, settings.notifications);
-  addInputListener(playBackControl, settings.playBackControl);
-  addInputListener(port, settings.apiSettings.port);
-  addInputListener(skipArtists, settings.skipArtists);
-  addTextAreaListener(skippedArtists, settings.skippedArtists);
-  addInputListener(singleInstance, settings.singleInstance);
-  addSelectListener(theme, settings.theme);
-  addInputListener(trayIcon, settings.trayIcon);
-  addInputListener(updateFrequency, settings.updateFrequency);
-});

src/pages/settings/settings.html

@@ -35,9 +35,6 @@
       <input type="radio" name="tab" id="advanced" />
       <label for="advanced">Advanced</label>
 
-      <input type="radio" name="tab" id="theming" />
-      <label for="theming">Theming</label>
-
       <input type="radio" name="tab" id="about" />
       <label for="about">About</label>
 
@@ -51,34 +48,33 @@
                 <p>Show a notification when a new song starts.</p>
               </div>
               <label class="switch">
-                <input id="notifications" type="checkbox" />
+                <input id="notifications" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
+            <div class="group__option">
+              <div class="group__description">
+                <h4>Mute Artists automatically</h4>
+                <p>The following list of artists (1 per line) will be muted automatically.</p>
+              </div>
+              <label class="switch">
+                <input id="muteArtists" type="checkbox">
+                <span class="switch__slider"></span>
+              </label>
+            </div>
+            <textarea id="mutedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
             <div class="group__option">
               <div class="group__description">
                 <h4>Skip Artists automatically</h4>
                 <p>The following list of artists (1 per line) will be skipped automatically.</p>
               </div>
               <label class="switch">
-                <input id="skipArtists" type="checkbox" />
+                <input id="skipArtists" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
             <textarea id="skippedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
-            <div class="group__option">
+
-              <div class="group__description">
-                <h4>Block ads</h4>
-                <p>
-                  Disabled audio & visual ads, unlocked lyrics, suggested track, track info,
-                  unlimited skips
-                </p>
-              </div>
-              <label class="switch">
-                <input id="adBlock" type="checkbox" />
-                <span class="switch__slider"></span>
-              </label>
-            </div>
           </div>
           <div class="group">
             <p class="group__title">UI</p>
@@ -88,7 +84,7 @@
                 <p>Always show TIDAL Hi-Fi's menu bar.</p>
               </div>
               <label class="switch">
-                <input id="menuBar" type="checkbox" />
+                <input id="menuBar" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -101,7 +97,7 @@
                 <p>Show TIDAL Hi-Fi's tray icon.</p>
               </div>
               <label class="switch">
-                <input id="trayIcon" type="checkbox" />
+                <input id="trayIcon" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -111,7 +107,7 @@
                 <p>Minimize window on close instead.</p>
               </div>
               <label class="switch">
-                <input id="minimizeOnClose" type="checkbox" />
+                <input id="minimizeOnClose" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -124,7 +120,7 @@
                 </p>
               </div>
               <label class="switch">
-                <input id="enableCustomHotkeys" type="checkbox" />
+                <input id="enableCustomHotkeys" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -134,7 +130,7 @@
                 <p>Prevent opening multiple TIDAL Hi-Fi's instances.</p>
               </div>
               <label class="switch">
-                <input id="singleInstance" type="checkbox" />
+                <input id="singleInstance" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -146,8 +142,8 @@
             <p class="group__title">API</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi has a built-in web API to allow users to get current song information.
+                TIDAL Hi-Fi has a built-in web API to allow users to get current song information. You can optionally
-                You can optionally enable playback control as well.
+                enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -156,14 +152,14 @@
                 <p>Enable the TIDAL Hi-Fi web API.</p>
               </div>
               <label class="switch">
-                <input id="apiCheckbox" type="checkbox" />
+                <input id="apiCheckbox" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
             <div class="group__option">
               <div class="group__description">
                 <label for="port">API port</label>
-                <input id="port" type="number" class="text-input" name="port" />
+                <input id="port" type="text" class="text-input" name="port">
               </div>
             </div>
             <div class="group__option">
@@ -172,7 +168,7 @@
                 <p>Enable playback control from the web API.</p>
               </div>
               <label class="switch">
-                <input id="playBackControl" type="checkbox" />
+                <input id="playBackControl" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -184,20 +180,18 @@
             <p class="group__title">Integrations</p>
             <div class="group__description">
               <p>
-                TIDAL Hi-Fi is extensible through the use of integrations. You can enable or
+                TIDAL Hi-Fi is extensible through the use of integrations.
-                disable them here.
+                You can enable or disable them here.
               </p>
             </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>MPRIS</h4>
-                <p>
+                <p>Enable MPRIS interface which provides a mechanism for discovery, querying and basic playback control
-                  Enable MPRIS interface which provides a mechanism for discovery, querying and
+                  on Linux systems.</p>
-                  basic playback control on Linux systems.
-                </p>
               </div>
               <label class="switch">
-                <input id="mprisCheckbox" type="checkbox" />
+                <input id="mprisCheckbox" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -207,7 +201,7 @@
                 <p>Show what you're listening to on Discord.</p>
               </div>
               <label class="switch">
-                <input id="enableDiscord" type="checkbox" />
+                <input id="enableDiscord" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -215,32 +209,18 @@
         </section>
 
         <section id="advanced-section" class="tabs__section">
-          <div class="group">
-            <p class="group__title">Settings</p>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Update frequency</h4>
-                <p>
-                  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.
-                </p>
-                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
-              </div>
-            </div>
           <div class="group">
             <p class="group__title">Flags</p>
             <div class="group__option">
               <div class="group__description">
                 <h4>Disable hardware built-in media keys</h4>
                 <p>
-                    Also prevents certain desktop environments from recognizing the chrome MPRIS
+                  Also prevents certain desktop environments from recognizing the chrome
-                    client separately from the custom MPRIS client.
+                  MPRIS client separately from the custom MPRIS client.
                 </p>
               </div>
               <label class="switch">
-                  <input id="disableHardwareMediaKeys" type="checkbox" />
+                <input id="disableHardwareMediaKeys" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
@@ -250,87 +230,35 @@
                 <p>Move a part of the rendering to the GPU for increased performance.</p>
               </div>
               <label class="switch">
-                  <input id="gpuRasterization" type="checkbox" />
+                <input id="gpuRasterization" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Disable Background Throttling</h4>
-                  <p>
+                <p>Makes app more responsive while in the background, at the cost of performance.</p>
-                    Makes app more responsive while in the background, at the cost of performance.
-                  </p>
               </div>
               <label class="switch">
-                  <input id="disableBackgroundThrottle" type="checkbox" />
+                <input id="disableBackgroundThrottle" type="checkbox">
                 <span class="switch__slider"></span>
               </label>
             </div>
           </div>
         </section>
 
-        <section id="theming-section" class="tabs__section">
-          <div class="group">
-            <p class="group__title">Theming</p>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Custom CSS</h4>
-                <p>
-                  The css that you put in here will be injected into a style tag in the head of the document.
-                </p>
-              </div>
-            </div>
-          </div>
-          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
-
-          <div class="group">
-            <p class="group__title">Theme files</p>
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Current theme</h4>
-                <p>
-                  Select a theme below or "Tidal - Default" to return to the original Tidal look.
-                </p>
-                <select class="select-input" id="themesList" name="themesList">
-
-                </select>
-              </div>
-            </div>
-
-            <div class="group__option">
-              <div class="group__description">
-                <h4>Upload new themes</h4>
-                <p>
-                  Click the button and select the css files to import. They will be added to the theme list
-                  automatically.
-                </p>
-                <div class="file-drop-area">
-                  <div>
-                    <span class="file-btn">Choose files</span>
-                    <span id="file-message" class="file-msg">or drag and drop files here</span>
-                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
-
         <section id="about-section" class="tabs__section about-section">
-          <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
+          <img alt="tidal icon" class="about-section__icon" src="./icon.png">
           <p class="about-section__text">
             <a class="external-link" data-url="https://github.com/Mastermindzh/tidal-hifi">TIDAL Hi-Fi</a>
-            is made by
+            is made by <a class="external-link" data-url="https://www.rickvanlieshout.com">
-            <a class="external-link" data-url="https://www.rickvanlieshout.com">
+              Rick van Lieshout</a>. <br>It uses <a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
-              Rick van Lieshout</a>. <br />It uses
-            <a class="external-link" data-url="https://castlabs.com/">Castlabs'</a>
             version of Electron for widevine support.
           </p>
         </section>
 
         <footer class="footer">
-          <p class="footer__note">
+          <p class="footer__note">Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
-            Some settings may require a restart of TIDAL Hi-Fi. To do so, click the button below:
           </p>
           <button class="footer__button" id="restart">Restart TIDAL Hi-Fi</button>
         </footer>

src/pages/settings/settings.scss

@@ -3,6 +3,7 @@
 $black: #17171a;
 $grey-333: #333;
 $white: #f9f9f9;
+
 $tidal-blue: #0ff;
 $tidal-grey: #72777f;
 $tidal-grey-darker: #404248;
@@ -35,14 +36,16 @@ $tidal-grey-darkest: #242528;
   src: url("fonts/NotoSans-Bold.ttf") format("truetype");
 }
 
-$font1: "Noto Sans", helvetica, sans-serif;
+$font1: "Noto Sans", Helvetica, sans-serif;
 
 // --- Mixins ---
 
 @mixin drag($enabled: true) {
   @if $enabled {
     -webkit-app-region: drag;
-  } @else {
+  }
+
+  @else {
     -webkit-app-region: no-drag;
   }
 }
@@ -59,7 +62,6 @@ html {
 
 .external-link {
   @extend button;
-
   text-decoration: underline;
 }
 
@@ -78,7 +80,6 @@ html {
 
   &__drag-area {
     @include drag;
-
     position: absolute;
     width: 100%;
     height: 50px;
@@ -89,7 +90,6 @@ html {
   &__close-button {
     @extend button;
     @include drag(false);
-
     position: absolute;
     top: 12px;
     right: 10px;
@@ -106,7 +106,7 @@ html {
     display: block;
     width: 18px;
     height: 18px;
-    opacity: 0.7;
+    opacity: .7;
   }
 
   // --- Settings tabs ---
@@ -125,9 +125,8 @@ html {
       outline: none;
     }
 
-    & + label {
+    &+label {
       @include drag(false);
-
       display: inline-block;
       position: relative;
       margin-right: 35px;
@@ -139,7 +138,7 @@ html {
       user-select: none;
     }
 
-    &:checked + label {
+    &:checked+label {
       border-bottom: 2px solid $tidal-blue;
       color: $tidal-blue;
     }
@@ -156,8 +155,8 @@ html {
     display: none;
   }
 
-  @for $i from 1 to 7 {
+  @for $i from 1 to 6 {
-    .settings > input:nth-child(#{$i * 2 - 1}):checked ~ & > .tabs__section:nth-child(#{$i}) {
+    .settings>input:nth-child(#{$i*2-1}):checked~&>.tabs__section:nth-child(#{$i}) {
       display: block;
     }
   }
@@ -218,7 +217,7 @@ html {
       width: 100%;
       margin-bottom: 10px;
       padding: 5px 0;
-      transition: 0.2s;
+      transition: .2s;
       border: 0;
       border-bottom: solid 1px $grey-333;
       outline: none;
@@ -230,42 +229,46 @@ html {
         border-color: $tidal-blue;
         color: $white;
       }
+
+      // --- Switch slider component ---
     }
   }
 }
 
 .switch {
   $this: &;
-
   position: relative;
   min-width: 50px;
   height: 28px;
+
   margin-left: 10px;
 
   input {
     transform: scale(0);
     outline: none;
 
-    &:checked + #{$this}__slider {
+    &:checked+#{$this}__slider {
       background-color: $tidal-blue;
 
       &::before {
         transform: translateX(22px);
-        background-color: $white;
+        background-color: white;
       }
     }
 
-    &:focus + #{$this}__slider {
+    &:focus+#{$this}__slider {
       box-shadow: inset 0 0 0 1px $tidal-blue;
     }
   }
 
   &__slider {
     @extend button;
-
     position: absolute;
-    inset: 0;
+    top: 0;
-    transition: 0.4s;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    transition: .4s;
     border-radius: 40px;
     background-color: $tidal-grey-darkest;
 
@@ -275,7 +278,7 @@ html {
       left: 2px;
       width: 24px;
       height: 24px;
-      transition: 0.4s;
+      transition: .4s;
       border-radius: 50%;
       background-color: $white;
       content: "";
@@ -291,7 +294,7 @@ html {
   min-height: 50px;
   max-height: 100px;
   padding: 8px;
-  transition: 0.2s;
+  transition: .2s;
   border: 0;
   border-bottom: 1px solid transparent;
   background: $tidal-grey-darkest;
@@ -342,12 +345,11 @@ html {
 
   &__button {
     @extend button;
-
     display: block;
     height: 48px;
     margin: auto;
     padding: 0 24px;
-    transition: 0.2s;
+    transition: .2s;
     border: 0;
     border-radius: 12px;
     background: $tidal-grey-darker;
@@ -359,87 +361,3 @@ html {
     }
   }
 }
-
-// file upload
-
-.file-drop-area {
-  position: relative;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  max-width: 100%;
-  padding: 25px 0 25px 0px;
-  border: 1px dashed $tidal-grey;
-  border-radius: 3px;
-  transition: 0.2s;
-  &.is-active {
-    background-color: $black;
-  }
-
-  div {
-    padding-left: 25px;
-  }
-}
-
-.file-btn {
-  flex-shrink: 0;
-  background-color: $black;
-  border: 1px solid $tidal-grey;
-  border-radius: 3px;
-  padding: 8px 15px;
-  margin-right: 10px;
-  font-size: 12px;
-  text-transform: uppercase;
-}
-
-.file-msg {
-  font-size: small;
-  font-weight: 300;
-  line-height: 1.4;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.file-input {
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100%;
-  width: 100%;
-  cursor: pointer;
-  opacity: 0;
-  &:focus {
-    outline: none;
-  }
-}
-
-.select-input {
-  display: block;
-  width: 100%;
-  margin-bottom: 10px;
-  padding: 5px 0;
-  transition: 0.2s;
-  border: 0;
-  border-bottom: solid 1px $grey-333;
-  outline: none;
-  background: transparent;
-  color: $tidal-grey;
-  font-size: 14px;
-
-  &:focus {
-    border-color: $tidal-blue;
-    color: $white;
-  }
-
-  option {
-    background-color: $tidal-grey-darkest;
-
-    &:disabled {
-      font-size: 1.2em;
-      line-height: 1.5em;
-      text-align: center;
-      color: $white;
-    }
-  }
-}

src/pages/settings/theming.ts

@@ -1,54 +0,0 @@
-import fs from "fs";
-
-const cssFilter = (file: string) => file.endsWith(".css");
-const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase());
-
-/**
- * Create an "options header" (disabled option) based on a bit of text
- * @param text of the header
- * @returns
- */
-export const getOptionsHeader = (text: string): HTMLOptionElement => {
-  const opt = new Option(text, undefined, false, false);
-  opt.disabled = true;
-  return opt;
-};
-
-/**
- * Maps a list of filenames to a list of HTMLOptionElements
- * Will strip ".css" from the name but keeps it in the value
- * @param array array of filenames
- * @returns
- */
-export const getOptions = (array: string[]) => {
-  return array.map((name) => {
-    return new Option(name.replace(".css", ""), name);
-  });
-};
-
-/**
- * Read .css files from a directory and return them in a sorted array.
- * @param directory to read from. Will be created if it doesn't exist
- * @returns
- */
-export const getThemeListFromDirectory = (directory: string): string[] => {
-  try {
-    makeUserThemesDirectory(directory);
-    return fs.readdirSync(directory).filter(cssFilter).sort(sort);
-  } catch (err) {
-    console.error(err);
-    return [];
-  }
-};
-
-/**
- * Create the directory to store user themes in
- * @param directory directory to create
- */
-export const makeUserThemesDirectory = (directory: string) => {
-  try {
-    fs.mkdirSync(directory, { recursive: true });
-  } catch (err) {
-    console.error(err);
-  }
-};

src/preload.js

@@ -1,21 +1,19 @@
-import { Notification, app, dialog } from "@electron/remote";
+const { setTitle } = require("./scripts/window-functions");
-import { ipcRenderer } from "electron";
+const { dialog, process, Notification } = require("@electron/remote");
-import fs from "fs";
+const { store, settings } = require("./scripts/settings");
-import Player from "mpris-service";
+const { ipcRenderer } = require("electron");
-import { globalEvents } from "./constants/globalEvents";
+const { app } = require("@electron/remote");
-import { settings } from "./constants/settings";
+const { downloadFile } = require("./scripts/download");
-import { statuses } from "./constants/statuses";
+const statuses = require("./constants/statuses");
-import { Options } from "./models/options";
+const hotkeys = require("./scripts/hotkeys");
-import { downloadFile } from "./scripts/download";
+const globalEvents = require("./constants/globalEvents");
-import { addHotkey } from "./scripts/hotkeys";
+const { skipArtists } = require("./constants/settings");
-
-import { settingsStore } from "./scripts/settings";
-import { setTitle } from "./scripts/window-functions";
 const notificationPath = `${app.getPath("userData")}/notification.jpg`;
 const appName = "Tidal Hifi";
 let currentSong = "";
-let player: Player;
+let player;
 let currentPlayStatus = statuses.paused;
+let isMutedArtist = true;
 
 const elements = {
   play: '*[data-test="play"]',
@@ -48,7 +46,7 @@ const elements = {
    * Get an element from the dom
    * @param {*} key key in elements object to fetch
    */
-  get: function (key: string) {
+  get: function (key) {
     return window.document.querySelector(this[key.toLowerCase()]);
   },
 
@@ -68,27 +66,16 @@ const elements = {
     return "";
   },
 
-  /**
+  getArtists: function () {
-   * returns an array of all artists in the current song
-   * @returns {Array} artists
-   */
-  getArtistsArray: function () {
     const footer = this.get("footer");
 
     if (footer) {
-      const artists = footer.querySelectorAll(this.artists);
+      const artists = footer.querySelector(this["artists"]);
-      if (artists) return Array.from(artists).map((artist) => (artist as HTMLElement).textContent);
+      if (artists) {
+        return artists.innerText;
+      }
     }
-    return [];
-  },
 
-  /**
-   * unify the artists array into a string separated by commas
-   * @param {Array} artistsArray
-   * @returns {String} artists
-   */
-  getArtistsString: function (artistsArray: string[]) {
-    if (artistsArray.length > 0) return artistsArray.join(", ");
     return "unknown artist(s)";
   },
 
@@ -123,7 +110,7 @@ const elements = {
    * Shorthand function to get the text of a dom element
    * @param {*} key key in elements object to fetch
    */
-  getText: function (key: string) {
+  getText: function (key) {
     const element = this.get(key);
     return element ? element.textContent : "";
   },
@@ -132,7 +119,7 @@ const elements = {
    * Shorthand function to click a dom element
    * @param {*} key key in elements object to fetch
    */
-  click: function (key: string) {
+  click: function (key) {
     this.get(key).click();
     return this;
   },
@@ -141,50 +128,11 @@ const elements = {
    * Shorthand function to focus a dom element
    * @param {*} key key in elements object to fetch
    */
-  focus: function (key: string) {
+  focus: function (key) {
     return this.get(key).focus();
   },
 };
 
-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(settings.updateFrequency) as number;
-  const defaultValue = 500;
-
-  if (!isNaN(storeValue)) {
-    return storeValue;
-  } else {
-    return defaultValue;
-  }
-}
-
 /**
  * Play or pause the current song
  */
@@ -204,41 +152,41 @@ function playPause() {
  * https://defkey.com/tidal-desktop-shortcuts
  */
 function addHotKeys() {
-  if (settingsStore.get(settings.enableCustomHotkeys)) {
+  if (store.get(settings.enableCustomHotkeys)) {
-    addHotkey("Control+p", function () {
+    hotkeys.add("Control+p", function () {
       elements.click("account").click("settings");
     });
-    addHotkey("Control+l", function () {
+    hotkeys.add("Control+l", function () {
       handleLogout();
     });
 
-    addHotkey("Control+h", function () {
+    hotkeys.add("Control+h", function () {
       elements.click("home");
     });
 
-    addHotkey("backspace", function () {
+    hotkeys.add("backspace", function () {
       elements.click("back");
     });
 
-    addHotkey("shift+backspace", function () {
+    hotkeys.add("shift+backspace", function () {
       elements.click("forward");
     });
 
-    addHotkey("control+u", function () {
+    hotkeys.add("control+u", function () {
       // reloading window without cache should show the update bar if applicable
-      window.location.reload();
+      window.location.reload(true);
     });
 
-    addHotkey("control+r", function () {
+    hotkeys.add("control+r", function () {
       elements.click("repeat");
     });
   }
 
   // always add the hotkey for the settings window
-  addHotkey("control+=", function () {
+  hotkeys.add("control+=", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
-  addHotkey("control+0", function () {
+  hotkeys.add("control+0", function () {
     ipcRenderer.send(globalEvents.showSettings);
   });
 }
@@ -250,26 +198,28 @@ function addHotKeys() {
 function handleLogout() {
   const logoutOptions = ["Cancel", "Yes, please", "No, thanks"];
 
-  dialog
+  dialog.showMessageBox(
-    .showMessageBox(null, {
+    null,
+    {
       type: "question",
       title: "Logging out",
       message: "Are you sure you want to log out?",
       buttons: logoutOptions,
       defaultId: 2,
-    })
+    },
-    .then((result: { response: number }) => {
+    function (response) {
-      if (logoutOptions.indexOf("Yes, please") == result.response) {
+      if (logoutOptions.indexOf("Yes, please") == response) {
         for (let i = 0; i < window.localStorage.length; i++) {
           const key = window.localStorage.key(i);
           if (key.startsWith("_TIDAL_activeSession")) {
             window.localStorage.removeItem(key);
-            break;
+            i = window.localStorage.length + 1;
           }
         }
         window.location.reload();
       }
-    });
+    }
+  );
 }
 
 function addFullScreenListeners() {
@@ -310,7 +260,7 @@ function addIPCEventListeners() {
  * Update the current status of tidal (e.g playing or paused)
  */
 function getCurrentlyPlayingStatus() {
-  const pause = elements.get("pause");
+  let pause = elements.get("pause");
   let status = undefined;
 
   // if pause button is visible tidal is playing
@@ -326,7 +276,7 @@ function getCurrentlyPlayingStatus() {
  * Convert the duration from MM:SS to seconds
  * @param {*} duration
  */
-function convertDuration(duration: string) {
+function convertDuration(duration) {
   const parts = duration.split(":");
   return parseInt(parts[1]) + 60 * parseInt(parts[0]);
 }
@@ -336,22 +286,21 @@ function convertDuration(duration: string) {
  *
  * @param {*} options
  */
-function updateMediaInfo(options: Options, notify: boolean) {
+function updateMediaInfo(options, notify) {
   if (options) {
     ipcRenderer.send(globalEvents.updateInfo, options);
-    if (settingsStore.get(settings.notifications) && notify) {
+    if (store.get(settings.notifications) && notify) {
-      new Notification({ title: options.title, body: options.artists, icon: options.icon }).show();
+      new Notification({ title: options.title, body: options.message, icon: options.icon }).show();
     }
     if (player) {
       player.metadata = {
         ...player.metadata,
         ...{
           "xesam:title": options.title,
-          "xesam:artist": [options.artists],
+          "xesam:artist": [options.message],
           "xesam:album": options.album,
           "mpris:artUrl": options.image,
           "mpris:length": convertDuration(options.duration) * 1000 * 1000,
-          "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
         },
       };
       player.playbackStatus = options.status == statuses.paused ? "Paused" : "Playing";
@@ -364,65 +313,41 @@ function updateMediaInfo(options: Options, notify: boolean) {
  * If it's a song it returns the track URL, if not it will return undefined
  */
 function getTrackURL() {
-  const id = getTrackID();
-  return `https://tidal.com/browse/track/${id}`;
-}
-
-function getTrackID() {
   const URLelement = elements.get("title").querySelector("a");
   if (URLelement !== null) {
-    const id = URLelement.href.replace(/\D/g, "");
+    const id = URLelement.href.replace(/[^0-9]/g, "");
-    return id;
+    return `https://tidal.com/browse/track/${id}`;
   }
 
   return window.location;
 }
 
-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
  */
 setInterval(function () {
   const title = elements.getText("title");
-  const artistsArray = elements.getArtistsArray();
+  const artists = elements.getArtists();
-  const artistsString = elements.getArtistsString(artistsArray);
+  skipArtistsIfFoundInSkippedArtistsList(artists);
-  skipArtistsIfFoundInSkippedArtistsList(artistsArray);
+  muteArtistIfFoundInMutedArtistsList(artists); // doing this here so that nothing can possibly fail before we call this function
 
   const album = elements.getAlbumName();
   const current = elements.getText("current");
   const duration = elements.getText("duration");
-  const songDashArtistTitle = `${title} - ${artistsString}`;
+  const songDashArtistTitle = `${title} - ${artists}`;
   const currentStatus = getCurrentlyPlayingStatus();
   const options = {
     title,
-    artists: artistsString,
+    message: artists,
     album: album,
     status: currentStatus,
     url: getTrackURL(),
     current,
     duration,
     "app-name": appName,
-    image: "",
-    icon: "",
   };
 
-  const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
+  const titleOrArtistChanged = currentSong !== songDashArtistTitle;
 
   // update title, url and play info with new info
   setTitle(songDashArtistTitle);
@@ -432,7 +357,7 @@ setInterval(function () {
 
   const image = elements.getSongIcon();
 
-  new Promise<void>((resolve) => {
+  new Promise((resolve) => {
     if (image.startsWith("http")) {
       options.image = image;
       downloadFile(image, notificationPath).then(
@@ -449,34 +374,48 @@ setInterval(function () {
       // if the image can't be found on the page continue without it
       resolve();
     }
-  }).then(() => {
+  }).then(
-    updateMediaInfo(options, titleOrArtistsChanged);
+    () => {
-    if (titleOrArtistsChanged) {
+      updateMediaInfo(options, titleOrArtistChanged);
-      updateMediaSession(options);
+    },
+    () => {}
+  );
+
+  /**
+   * Checks whether the current artist is included in the "muted artists" list and if so it will automatically mute the player
+   */
+  function muteArtistIfFoundInMutedArtistsList(artists) {
+    if (store.get(settings.muteArtists)) {
+      const mutedArtists = store.get(settings.mutedArtists);
+      if (mutedArtists.find((artist) => artist === artists) !== undefined) {
+        if (!elements.isMuted()) {
+          isMutedArtist = true;
+          elements.click("volume");
+        }
+      } else if (isMutedArtist && elements.isMuted()) {
+        elements.click("volume");
+        isMutedArtist = false;
+      }
+    }
   }
-  });
 
   /**
    * automatically skip a song if the artists are found in the list of artists to skip
-   * @param {*} artists array of artists
+   * @param {*} artists list of artists to skip
    */
-  function skipArtistsIfFoundInSkippedArtistsList(artists: string[]) {
+  function skipArtistsIfFoundInSkippedArtistsList(artists) {
-    if (settingsStore.get(settings.skipArtists)) {
+    if (store.get(skipArtists)) {
-      const skippedArtists = settingsStore.get<string, string[]>(settings.skippedArtists);
+      const skippedArtists = store.get(settings.skippedArtists);
-      if (skippedArtists.length > 0) {
+      if (skippedArtists.find((artist) => artist === artists) !== undefined) {
-        const artistsToSkip = skippedArtists.map((artist) => artist);
-        const artistNames = Object.values(artists).map((artist) => artist);
-        const foundArtist = artistNames.some((artist) => artistsToSkip.includes(artist));
-        if (foundArtist) {
         elements.click("next");
       }
     }
   }
-  }
+}, 1000);
-}, getUpdateFrequency());
 
-if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
+if (process.platform === "linux" && store.get(settings.mpris)) {
   try {
+    const Player = require("mpris-service");
     player = Player({
       name: "tidal-hifi",
       identity: "tidal-hifi",
@@ -493,7 +432,7 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
     });
 
     // Events
-    const events = {
+    var events = {
       next: "next",
       previous: "previous",
       pause: "pause",
@@ -503,7 +442,7 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
       loopStatus: "repeat",
       shuffle: "shuffle",
       seek: "seek",
-    } as { [key: string]: string };
+    };
     Object.keys(events).forEach(function (eventName) {
       player.on(eventName, function () {
         const eventValue = events[eventName];
@@ -529,7 +468,7 @@ if (process.platform === "linux" && settingsStore.get(settings.mpris)) {
     console.log("player api not working");
   }
 }
-addCustomCss();
+
 addHotKeys();
 addIPCEventListeners();
 addFullScreenListeners();

src/scripts/discord.js

@@ -0,0 +1,95 @@
+const discordrpc = require("discord-rpc");
+const { app, ipcMain } = require("electron");
+const globalEvents = require("../constants/globalEvents");
+const clientId = "833617820704440341";
+const mediaInfoModule = require("./mediaInfo");
+const discordModule = [];
+
+function timeToSeconds(timeArray) {
+  let minutes = timeArray[0] * 1;
+  let seconds = minutes * 60 + timeArray[1] * 1;
+  return seconds;
+}
+
+let rpc;
+const observer = (event, arg) => {
+  if (mediaInfoModule.mediaInfo.status == "paused" && rpc) {
+    rpc.setActivity(idleStatus);
+  } else if (rpc) {
+    const currentSeconds = timeToSeconds(mediaInfoModule.mediaInfo.current.split(":"));
+    const durationSeconds = timeToSeconds(mediaInfoModule.mediaInfo.duration.split(":"));
+    const date = new Date();
+    const now = (date.getTime() / 1000) | 0;
+    const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
+    if (mediaInfoModule.mediaInfo.url) {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Listening to ${mediaInfoModule.mediaInfo.title}`,
+          state: mediaInfoModule.mediaInfo.artist
+            ? mediaInfoModule.mediaInfo.artist
+            : "unknown artist(s)",
+          startTimestamp: parseInt(now),
+          endTimestamp: parseInt(remaining),
+          largeImageKey: mediaInfoModule.mediaInfo.image,
+          largeImageText: mediaInfoModule.mediaInfo.album
+            ? mediaInfoModule.mediaInfo.album
+            : `${idleStatus.largeImageText}`,
+          buttons: [{ label: "Play on Tidal", url: mediaInfoModule.mediaInfo.url }],
+        },
+      });
+    } else {
+      rpc.setActivity({
+        ...idleStatus,
+        ...{
+          details: `Watching ${mediaInfoModule.mediaInfo.title}`,
+          state: mediaInfoModule.mediaInfo.artist,
+          startTimestamp: parseInt(now),
+          endTimestamp: parseInt(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
+ */
+discordModule.initRPC = function () {
+  rpc = new discordrpc.Client({ transport: "ipc" });
+  rpc.login({ clientId }).then(
+    () => {
+      discordModule.rpc = rpc;
+
+      rpc.on("ready", () => {
+        rpc.setActivity(idleStatus);
+      });
+      ipcMain.on(globalEvents.updateInfo, observer);
+    },
+    () => {
+      console.error("Can't connect to Discord, is it running?");
+    }
+  );
+};
+
+/**
+ * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
+ */
+discordModule.unRPC = function () {
+  if (rpc) {
+    rpc.clearActivity();
+    rpc.destroy();
+    rpc = false;
+    discordModule.rpc = undefined;
+    ipcMain.removeListener(globalEvents.updateInfo, observer);
+  }
+};
+
+module.exports = discordModule;

src/scripts/discord.ts

@@ -1,88 +0,0 @@
-import { Client } from "discord-rpc";
-import { app, ipcMain } from "electron";
-import { globalEvents } from "../constants/globalEvents";
-import { MediaStatus } from "../models/mediaStatus";
-import { mediaInfo } from "./mediaInfo";
-
-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 (mediaInfo.status == MediaStatus.paused && rpc) {
-    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 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
- */
-export const initRPC = () => {
-  rpc = new Client({ transport: "ipc" });
-  rpc.login({ clientId }).then(
-    () => {
-      rpc.on("ready", () => {
-        rpc.setActivity(idleStatus);
-      });
-      ipcMain.on(globalEvents.updateInfo, observer);
-    },
-    () => {
-      console.error("Can't connect to Discord, is it running?");
-    }
-  );
-};
-
-/**
- * Remove any RPC connection with discord and remove the event listener on globalEvents.updateInfo
- */
-export const unRPC = () => {
-  if (rpc) {
-    rpc.clearActivity();
-    rpc.destroy();
-    rpc = null;
-    ipcMain.removeListener(globalEvents.updateInfo, observer);
-  }
-};

src/scripts/download.js

@@ -0,0 +1,26 @@
+const download = {};
+const request = require("request");
+const fs = require("fs");
+
+/**
+ * download and save a file
+ * @param {*} fileUrl url to download
+ * @param {*} targetPath path to save it at
+ */
+download.downloadFile = function(fileUrl, targetPath) {
+  return new Promise((resolve, reject) => {
+    var req = request({
+      method: "GET",
+      uri: fileUrl,
+    });
+
+    var out = fs.createWriteStream(targetPath);
+    req.pipe(out);
+
+    req.on("end", resolve);
+
+    req.on("error", reject);
+  });
+};
+
+module.exports = download;

src/scripts/download.ts

@@ -1,23 +0,0 @@
-import fs from "fs";
-import request from "request";
-
-/**
- * download and save a file
- * @param {string} fileUrl url to download
- * @param {string} targetPath path to save it at
- */
-export const downloadFile = function (fileUrl: string, targetPath: string) {
-  return new Promise((resolve, reject) => {
-    const req = request({
-      method: "GET",
-      uri: fileUrl,
-    });
-
-    const out = fs.createWriteStream(targetPath);
-    req.pipe(out);
-
-    req.on("end", resolve);
-
-    req.on("error", reject);
-  });
-};

src/scripts/express.js

@@ -0,0 +1,70 @@
+const express = require("express");
+const { mediaInfo } = require("./mediaInfo");
+const { store, settings } = require("./settings");
+const globalEvents = require("./../constants/globalEvents");
+const statuses = require("./../constants/statuses");
+const expressModule = {};
+const fs = require("fs");
+
+let expressInstance;
+
+/**
+ * Function to enable tidal-hifi's express api
+ */
+expressModule.run = function(mainWindow) {
+  /**
+   * Shorthand to handle a fire and forget global event
+   * @param {*} res
+   * @param {*} action
+   */
+  function handleGlobalEvent(res, action) {
+    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));
+  expressApp.get("/image", (req, res) => {
+    var 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 (store.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 == statuses.playing) {
+        handleGlobalEvent(res, globalEvents.pause);
+      } else {
+        handleGlobalEvent(res, globalEvents.play);
+      }
+    });
+  }
+  if (store.get(settings.api)) {
+    let port = store.get(settings.apiSettings.port);
+
+    expressInstance = expressApp.listen(port, "127.0.0.1", () => {});
+    expressInstance.on("error", function(e) {
+      let message = e.code;
+      if (e.code === "EADDRINUSE") {
+        message = `Port ${port} in use.`;
+      }
+      const { dialog } = require("electron");
+      dialog.showErrorBox("Api failed to start.", message);
+    });
+  } else {
+    expressInstance = undefined;
+  }
+};
+
+module.exports = expressModule;

src/scripts/express.ts

@@ -1,66 +0,0 @@
-import { BrowserWindow, dialog } from "electron";
-import express, { Response } from "express";
-import fs from "fs";
-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-hifi'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 == statuses.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/hotkeys.js

@@ -0,0 +1,11 @@
+const hotkeyjs = require("hotkeys-js");
+const hotkeys = {};
+
+hotkeys.add = function(keys, func) {
+  hotkeyjs(keys, function(event, args) {
+    event.preventDefault();
+    func(event, args);
+  });
+};
+
+module.exports = hotkeys;

src/scripts/hotkeys.ts

@@ -1,11 +0,0 @@
-import hotkeyjs, { HotkeysEvent } from "hotkeys-js";
-
-export const addHotkey = function (
-  keys: string,
-  func: (event?: KeyboardEvent, args?: HotkeysEvent) => void
-) {
-  hotkeyjs(keys, function (event, args) {
-    event.preventDefault();
-    func(event, args);
-  });
-};

src/scripts/mediaInfo.js

@@ -1,21 +1,26 @@
-import { MediaInfo } from "../models/mediaInfo";
+const statuses = require("./../constants/statuses");
-import { statuses } from "./../constants/statuses";
 
-export const mediaInfo = {
+const mediaInfo = {
   title: "",
-  artists: "",
+  artist: "",
   album: "",
   icon: "",
   status: statuses.paused,
   url: "",
   current: "",
   duration: "",
-  image: "tidal-hifi-icon",
+  image: "tidal-hifi-icon"
+};
+const mediaInfoModule = {
+  mediaInfo,
 };
 
-export const updateMediaInfo = (arg: MediaInfo) => {
+/**
+ * Update artist and song info in the mediaInfo constant
+ */
+mediaInfoModule.update = function (arg) {
   mediaInfo.title = propOrDefault(arg.title);
-  mediaInfo.artists = propOrDefault(arg.artists);
+  mediaInfo.artist = propOrDefault(arg.message);
   mediaInfo.album = propOrDefault(arg.album);
   mediaInfo.icon = propOrDefault(arg.icon);
   mediaInfo.url = propOrDefault(arg.url);
@@ -30,6 +35,8 @@ export const updateMediaInfo = (arg: MediaInfo) => {
  * @param {*} prop property to check
  * @param {*} defaultValue defaults to ""
  */
-function propOrDefault(prop: string, defaultValue = "") {
+function propOrDefault(prop, defaultValue = "") {
   return prop ? prop : defaultValue;
 }
+
+module.exports = mediaInfoModule;

src/scripts/menu.js

@@ -1,7 +1,7 @@
-import { BrowserWindow, Menu, app } from "electron";
+const { Menu, app } = require("electron");
-import { showSettingsWindow } from "./settings";
+const { showSettingsWindow } = require("./settings");
 const isMac = process.platform === "darwin";
-import name from "./../constants/values";
+const { name } = require("./../constants/values");
 
 const settingsMenuEntry = {
   label: "Settings",
@@ -19,7 +19,9 @@ const quitMenuEntry = {
   accelerator: "Control+Q",
 };
 
-export const getMenu = function (mainWindow: BrowserWindow) {
+const menuModule = {};
+
+menuModule.getMenu = function (mainWindow) {
   const toggleWindow = {
     label: "Toggle Window",
     click: function () {
@@ -111,9 +113,11 @@ export const getMenu = function (mainWindow: BrowserWindow) {
     quitMenuEntry,
   ];
 
-  return Menu.buildFromTemplate(mainMenu as any);
+  return Menu.buildFromTemplate(mainMenu);
 };
 
-export const addMenu = function (mainWindow: BrowserWindow) {
+menuModule.addMenu = function (mainWindow) {
-  Menu.setApplicationMenu(getMenu(mainWindow));
+  Menu.setApplicationMenu(menuModule.getMenu(mainWindow));
 };
+
+module.exports = menuModule;

src/scripts/settings.js

@@ -1,39 +1,36 @@
-import Store from "electron-store";
+const Store = require("electron-store");
+const settings = require("./../constants/settings");
+const path = require("path");
+const { BrowserWindow } = require("electron");
 
-import { settings } from "../constants/settings";
+let settingsWindow;
-import path from "path";
-import { BrowserWindow } from "electron";
 
-let settingsWindow: BrowserWindow;
+const store = new Store({
-
-export const settingsStore = new Store({
   defaults: {
-    adBlock: false,
+    notifications: true,
     api: true,
+    playBackControl: true,
+    muteArtists: false,
+    mutedArtists: ["TIDAL"],
+    skipArtists: false,
+    skippedArtists: [""],
+    disableBackgroundThrottle: true,
+    menuBar: true,
     apiSettings: {
       port: 47836,
     },
-    customCSS: [],
+    singleInstance: true,
-    disableBackgroundThrottle: true,
     disableHardwareMediaKeys: false,
+    trayIcon: true,
+    minimizeOnClose: false,
+    mpris: false,
     enableCustomHotkeys: false,
     enableDiscord: false,
+    windowBounds: { width: 800, height: 600 },
     flags: {
       gpuRasterization: true,
       disableHardwareMediaKeys: false,
     },
-    menuBar: true,
-    minimizeOnClose: false,
-    mpris: false,
-    notifications: true,
-    playBackControl: true,
-    singleInstance: true,
-    skipArtists: false,
-    skippedArtists: [""],
-    theme: "none",
-    trayIcon: true,
-    updateFrequency: 500,
-    windowBounds: { width: 800, height: 600 },
   },
   migrations: {
     "3.1.0": (migrationStore) => {
@@ -47,15 +44,16 @@ export const settingsStore = new Store({
 });
 
 const settingsModule = {
-  // settings,
+  store,
+  settings,
   settingsWindow,
 };
 
-export const createSettingsWindow = function () {
+settingsModule.createSettingsWindow = function () {
   settingsWindow = new BrowserWindow({
     width: 700,
     height: 600,
-    resizable: true,
+    resizable: false,
     show: false,
     transparent: true,
     frame: false,
@@ -67,7 +65,7 @@ export const createSettingsWindow = function () {
     },
   });
 
-  settingsWindow.on("close", (event: Event) => {
+  settingsWindow.on("close", (event) => {
     if (settingsWindow != null) {
       event.preventDefault();
       settingsWindow.hide();
@@ -79,17 +77,19 @@ export const createSettingsWindow = function () {
   settingsModule.settingsWindow = settingsWindow;
 };
 
-export const showSettingsWindow = function (tab = "general") {
+settingsModule.showSettingsWindow = function (tab = "general") {
   settingsWindow.webContents.send("goToTab", tab);
 
   // refresh data just before showing the window
   settingsWindow.webContents.send("refreshData");
   settingsWindow.show();
 };
-export const hideSettingsWindow = function () {
+settingsModule.hideSettingsWindow = function () {
   settingsWindow.hide();
 };
 
-export const closeSettingsWindow = function () {
+settingsModule.closeSettingsWindow = function () {
   settingsWindow = null;
 };
+
+module.exports = settingsModule;

src/scripts/tray.js

@@ -0,0 +1,26 @@
+const { Tray } = require("electron");
+const { getMenu } = require("./menu");
+const trayModule = {};
+let tray;
+
+trayModule.addTray = function (mainWindow, options = { icon: "" }) {
+  tray = new Tray(options.icon);
+  tray.setIgnoreDoubleClickEvents(true);
+  tray.setToolTip("Tidal-hifi");
+
+  const menu = getMenu(mainWindow);
+
+  tray.setContextMenu(menu);
+
+  tray.on("click", function () {
+    mainWindow.isVisible() ? mainWindow.focus() : mainWindow.show();
+  });
+};
+
+trayModule.refreshTray = function (mainWindow) {
+  if (!tray) {
+    trayModule.addTray(mainWindow);
+  }
+};
+
+module.exports = trayModule;

src/scripts/tray.ts

@@ -1,32 +0,0 @@
-import { BrowserWindow, Tray } from "electron";
-import { getMenu } from "./menu";
-
-let tray: Tray;
-
-export const addTray = function (mainWindow: BrowserWindow, options = { icon: "" }) {
-  tray = new Tray(options.icon);
-  tray.setIgnoreDoubleClickEvents(true);
-  tray.setToolTip("Tidal-hifi");
-
-  const menu = getMenu(mainWindow);
-
-  tray.setContextMenu(menu);
-
-  tray.on("click", function () {
-    if (mainWindow.isVisible()) {
-      if (!mainWindow.isFocused()) {
-        mainWindow.focus();
-      } else {
-        mainWindow.hide();
-      }
-    } else {
-      mainWindow.show();
-    }
-  });
-};
-
-export const refreshTray = function (mainWindow: BrowserWindow) {
-  if (!tray) {
-    addTray(mainWindow);
-  }
-};

src/scripts/window-functions.js

@@ -0,0 +1,11 @@
+const windowFunctions = {};
+
+windowFunctions.setTitle = function(title) {
+  window.document.title = title;
+};
+
+windowFunctions.getTitle = function() {
+  return window.document.title;
+};
+
+module.exports = windowFunctions;

src/scripts/window-functions.ts

@@ -1,7 +0,0 @@
-export const setTitle = function (title: string) {
-  window.document.title = title;
-};
-
-export const getTitle = function () {
-  return window.document.title;
-};

src/themes/Blood.scss

@@ -1,10 +0,0 @@
-$foreground: red;
-$background: black;
-
-span {
-  color: $foreground;
-}
-
-.sidebar--WvRg_ {
-  background-color: $background;
-}

src/themes/Tokyo Night.scss

@@ -1,82 +0,0 @@
-:root {
-  --footer-player-background: #1a1b26;
-  --sidebar-background: #1a1b26;
-  --sidebar-hover-background: #414868;
-  --sidebar-menu-top-text: #565f89;
-  --sidebar-menu-playlist-text: #565f89;
-  --search-background: #1a1b26;
-  --main-background: #16161e;
-  --main-navigation-control-background: #1a1b26;
-  --main-feed-button-background: #1a1b26;
-  --player-control-background: #24283b;
-  --player-control-active-button: #ff9e64;
-  --player-progress-bar: #ff9e64;
-  --indicator-hifi-background: #9ece6a;
-  --indicator-hifi-span: #1a1b26;
-  --player-control-favorite: #f7768e;
-  --search-dialog-background: #24283b;
-  --right-queue-background: #24283b;
-}
-.player--fNPGt.notFullscreen--ugyc2 {
-  background-color: var(--footer-player-background);
-}
-.sidebar--WvRg_ {
-  background-color: var(--sidebar-background);
-  contain: strict;
-  flex-grow: 1;
-  overflow-y: auto;
-}
-.item--VTpWS:hover {
-  background-color: var(--sidebar-hover-background);
-}
-.main--LUnJp {
-  background-color: var(--main-background);
-}
-button.button--ncJwL {
-  background-color: var(--main-navigation-control-background);
-}
-.player--fNPGt.lossLess--g5Jss button.withBackground[aria-checked="true"] path {
-  fill: var(--player-control-active-button);
-}
-.player--fNPGt.lossLess--g5Jss button.withBackground[aria-checked="true"] {
-  background-color: var(--player-control-background);
-}
-.activeItem--qV6eL .activeItem--qV6eL .playlistItem--YARJh .section--FI41E.playingItem--eWkYS {
-  color: #565f89;
-}
-.progressBarWrapper--WZfox {
-  color: var(--player-progress-bar);
-}
-.playbackControls--FLeZA button .tidal-ui__icon {
-  transform: scale(1);
-}
-.css-11m9iw3 {
-  background-color: var(--indicator-hifi-background);
-}
-.css-11m9iw3 span {
-  color: var(--indicator-hifi-span);
-}
-.activeItem--qV6eL {
-  color: var(--sidebar-menu-top-text);
-}
-.activeItem--qV6eL .playlistItem--YARJh {
-  color: var(--sidebar-menu-playlist-text);
-}
-button.feedBell--B8anb {
-  background-color: var(--main-feed-button-background);
-}
-.baseContainer--cbf17 {
-  background-color: var(--search-dialog-background);
-}
-.favoriteButton--TtBlM.is-favorite path {
-  fill: var(--player-control-favorite);
-}
-.container--mkEWd {
-  background-color: var(--right-queue-background);
-}
-.container--vJVjO {
-  background-color: var(--search-background);
-}
-.searchFieldHighlighted--Fitvs {
-  color: var(--snow-white);
-}

src/types/mpris-service.d.ts

@@ -1,60 +0,0 @@
-declare class InitOptions {
-  name: string;
-  identity: string;
-  supportedUriSchemes: string[];
-  supportedMimeTypes: string[];
-  supportedInterfaces: string[];
-  desktopEntry: string;
-}
-
-declare class Player {
-  metadata: {
-    "xesam:title": string;
-    "xesam:artist": string[];
-    "xesam:album": string;
-    "mpris:artUrl": string;
-    "mpris:length": number;
-    "mpris:trackid": string;
-    // other options
-    [key: string]: string | number | string[] | object;
-  };
-  playbackStatus: string;
-  identity: string;
-  fullscreen: boolean;
-  supportedUriSchemes: string[];
-  supportedMimeTypes: string[];
-  canQuit: boolean;
-  canRaise: boolean;
-  canSetFullscreen: boolean;
-  hasTrackList: boolean;
-  desktopEntry: string;
-  loopStatus: string;
-  shuffle: boolean;
-  volume: number;
-  canControl: boolean;
-  canPause: boolean;
-  canPlay: boolean;
-  canSeek: boolean;
-  canGoNext: boolean;
-  canGoPrevious: boolean;
-  rate: number;
-  minimumRate: number;
-  maximumRate: number;
-  playlists: string[];
-  activePlaylist: string;
-
-  constructor(opts: { name: string; supportedInterfaces?: string[] });
-  constructor(opts: InitOptions);
-
-  getPosition(): number;
-  seeked(): void;
-  getTrackIndex(trackId: number): number;
-  getTrack(trackId: number): string;
-  addTrack(track: object): void;
-  removeTrack(trackId: number): number;
-  getPlaylistIndex(playlistId: number): number;
-  setPlaylists(playlists: object): void;
-  setActivePlaylist(playlistId: number): void;
-
-  on(event: string | symbol, listener: (...args: object[]) => void): this;
-}

tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "typeRoots": ["src/types"],
-    "module": "commonjs",
-    "target": "ES6",
-    "noImplicitAny": true,
-    "sourceMap": true,
-    "allowJs": true,
-    "outDir": "ts-dist",
-    "esModuleInterop": true,
-    "baseUrl": ".",
-    "paths": {
-      "*": ["node_modules/*"]
-    }
-  },
-  "include": ["src/**/*"]
-}