Merge 0f5e00c4df into 91156e5936

.stylelintrc.json

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

.vscode/settings.json

@@ -14,6 +14,7 @@
     "rescrobbler",
     "scrobble",
     "scrobbling",
+    "Songwhip",
     "trackid",
     "tracklist",
     "widevine",

CHANGELOG.md

@@ -4,13 +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.17.0]
-
-- Added an option to disable the dynamic title and set it to a static one, [#491](https://github.com/Mastermindzh/tidal-hifi/pull/491)
-- Discord integration now says "Listening to" instead of "playing" [#488](https://github.com/Mastermindzh/tidal-hifi/pull/488) && [#454](https://github.com/Mastermindzh/tidal-hifi/pull/454)
-- Fixed several element names in the dom scraper
-- Removed the Songwhip (they shut down) integration and replaced it with TIDAL's universal link system
-
 ## [5.16.0]
 
 - Fix issue #449 Discord RPC stuck on "Browsing Tidal".
@@ -21,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 - Updated most dependency versions
-
   - This includes Electron 31!
 
 - Added a channel selector so we can now use Tidal's staging environment directly from the app
@@ -113,12 +105,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Updated Electron to 28.1.1 (fixes [325](https://github.com/Mastermindzh/tidal-hifi/issues/325))
 - Updated dependencies to latest
-
   - added theme files to stylelint ignore
   - fixed other stylelint errors
 
 - Added functionality to favorite a song (fixes [#323](https://github.com/Mastermindzh/tidal-hifi/issues/323))
-
   - Added a hotkey to favorite ("Add to collection") songs: Control+a
   - Added the "favorite" field in the `mediaInfo` and the API `/current` endpoint
   - Added an endpoint to toggle favoriting a song: `http://localhost:47836/favorite/toggle`

README.md

@@ -48,6 +48,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
 - AlbumArt in integrations ([best-effort](https://github.com/Mastermindzh/tidal-hifi/pull/88#pullrequestreview-840814847))
 - Custom [integrations](#integrations)
   - [ListenBrainz](https://listenbrainz.org/?redirect=false) integration
+  - Songwhip.com integration (hotkey `ctrl + w`)
   - Discord RPC integration (showing "now listening", "Browsing", etc)
     - Flatpak version only works if both Discord and Tidal-HiFi are flatpaks
   - MPRIS integration

SECURITY.md

@@ -8,3 +8,4 @@ Only the very latest 😄.
 
 If you find a vulnerability just add it as an issue.
 If there's an especially bad vulnerability that you don't want to make public just send me a private message (email, discord, wherever).
+

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.17.0",
+      "version": "5.16.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.17.0",
+  "version": "5.16.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -23,7 +23,6 @@
     "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",
-    "prettier": "prettier . --write",
     "builder": "electron-builder --publish=never",
     "sass": "sass ./src/pages/settings/settings.scss ./src/pages/settings/settings.css && sass --no-source-map src/themes:themes",
     "style-lint": "npx stylelint **/*.scss",

scripts/verifyElements.js

@@ -16,9 +16,8 @@
     search: '[class^="searchField"]',
     shuffle: '*[data-test="shuffle"]',
     repeat: '*[data-test="repeat"]',
-    account: '*[data-test^="profile-image-button"]',
+    account: '*[class^="profileOptions"]',
-    settings: '*[data-test^="sidebar-menu-button"]',
+    settings: '*[data-test^="open-settings"]',
-    openSettings: '*[data-test^="open-settings"]',
     media: '*[data-test="current-media-imagery"]',
     image: "img",
     current: '*[data-test="current-time"]',

src/constants/globalEvents.ts

@@ -10,7 +10,7 @@ export const globalEvents = {
   showSettings: "showSettings",
   storeChanged: "storeChanged",
   error: "error",
-  getUniversalLink: "getUniversalLink",
+  whip: "whip",
   log: "log",
   toggleFavorite: "toggleFavorite",
   toggleShuffle: "toggleShuffle",

src/constants/settings.ts

@@ -55,7 +55,6 @@ export const settings = {
   singleInstance: "singleInstance",
   skipArtists: "skipArtists",
   skippedArtists: "skippedArtists",
-  staticWindowTitle: "staticWindowTitle",
   theme: "theme",
   trayIcon: "trayIcon",
   updateFrequency: "updateFrequency",

src/features/api/swagger.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "TIDAL Hi-Fi API",
-    "version": "5.17.0",
+    "version": "5.16.0",
     "description": "",
     "license": {
       "name": "MIT",
@@ -21,7 +21,9 @@
     "/current": {
       "get": {
         "summary": "Get current media info",
-        "tags": ["current"],
+        "tags": [
+          "current"
+        ],
         "responses": {
           "200": {
             "description": "Current media info",
@@ -39,7 +41,9 @@
     "/current/image": {
       "get": {
         "summary": "Get current media image",
-        "tags": ["current"],
+        "tags": [
+          "current"
+        ],
         "responses": {
           "200": {
             "description": "Current media image",
@@ -61,7 +65,9 @@
     "/player/play": {
       "post": {
         "summary": "Play the current media",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -79,7 +85,9 @@
     "/player/favorite/toggle": {
       "post": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -97,7 +105,9 @@
     "/player/pause": {
       "post": {
         "summary": "Pause the current media",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -115,7 +125,9 @@
     "/player/next": {
       "post": {
         "summary": "Play the next song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -133,7 +145,9 @@
     "/player/previous": {
       "post": {
         "summary": "Play the previous song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -151,7 +165,9 @@
     "/player/shuffle/toggle": {
       "post": {
         "summary": "Play the previous song",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -169,7 +185,9 @@
     "/player/repeat/toggle": {
       "post": {
         "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -187,7 +205,9 @@
     "/player/playpause": {
       "post": {
         "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": ["player"],
+        "tags": [
+          "player"
+        ],
         "responses": {
           "200": {
             "description": "Ok",
@@ -205,7 +225,9 @@
     "/settings/skipped-artists": {
       "get": {
         "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "The list book.",
@@ -221,7 +243,9 @@
       },
       "post": {
         "summary": "Add new artists to the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -242,7 +266,9 @@
     "/settings/skipped-artists/delete": {
       "post": {
         "summary": "Remove artists from the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "requestBody": {
           "required": true,
           "content": {
@@ -263,7 +289,9 @@
     "/settings/skipped-artists/current": {
       "post": {
         "summary": "Add the current artist to the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -272,7 +300,9 @@
       },
       "delete": {
         "summary": "Remove the current artist from the list of skipped artists",
-        "tags": ["settings"],
+        "tags": [
+          "settings"
+        ],
         "responses": {
           "200": {
             "description": "Ok"
@@ -283,7 +313,9 @@
     "/image": {
       "get": {
         "summary": "Get current image",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -306,7 +338,9 @@
     "/play": {
       "get": {
         "summary": "Play the current media",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -325,7 +359,9 @@
     "/favorite/toggle": {
       "get": {
         "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -344,7 +380,9 @@
     "/pause": {
       "get": {
         "summary": "Pause the current media",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -363,7 +401,9 @@
     "/next": {
       "get": {
         "summary": "Play the next song",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -382,7 +422,9 @@
     "/previous": {
       "get": {
         "summary": "Play the previous song",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -401,7 +443,9 @@
     "/playpause": {
       "get": {
         "summary": "Toggle play/pause",
-        "tags": ["legacy"],
+        "tags": [
+          "legacy"
+        ],
         "deprecated": true,
         "responses": {
           "200": {
@@ -514,7 +558,10 @@
         "items": {
           "type": "string"
         },
-        "example": ["Artist1", "Artist2"]
+        "example": [
+          "Artist1",
+          "Artist2"
+        ]
       }
     }
   },

src/features/sharingService/sharingService.ts

@@ -1,10 +0,0 @@
-export class SharingService {
-  /**
-   * Retrieve the universal link given a regular track link
-   * @param currentUrl
-   * @returns
-   */
-  public static getUniversalLink(currentUrl: string): string {
-    return `${currentUrl}?u`;
-  }
-}

src/features/songwhip/models/Artist.ts

@@ -0,0 +1,21 @@
+import { ServiceLinks } from "./ServiceLinks";
+
+export interface Artist {
+  type: string;
+  id: number;
+  path: string;
+  name: string;
+  sourceUrl: string;
+  sourceCountry: string;
+  url: string;
+  image: string;
+  createdAt: string;
+  updatedAt: string;
+  refreshedAt: string;
+  serviceIds: { [key: string]: string };
+  orchardId: string;
+  spotifyId: string;
+  links: { [key: string]: ServiceLinks[] };
+  linksCountries: string[];
+  description: string;
+}

src/features/songwhip/models/ServiceLinks.ts

@@ -0,0 +1,4 @@
+export interface ServiceLinks {
+  link: string;
+  countries: string[];
+}

src/features/songwhip/models/whip.ts

@@ -0,0 +1,27 @@
+import { Artist } from "./Artist";
+import { ServiceLinks } from "./ServiceLinks";
+
+export interface WhippedResult {
+  status: string;
+  data: {
+    item: {
+      type: string;
+      id: number;
+      path: string;
+      name: string;
+      url: string;
+      sourceUrl: string;
+      sourceCountry: string;
+      releaseDate: string;
+      createdAt: string;
+      updatedAt: string;
+      refreshedAt: string;
+      image: string;
+      isrc: string;
+      isExplicit: boolean;
+      links: { [key: string]: ServiceLinks[] };
+      linksCountries: string[];
+      artists: Artist[];
+    };
+  };
+}

src/features/songwhip/songwhip.ts

@@ -0,0 +1,32 @@
+import { WhippedResult } from "./models/whip";
+import axios from "axios";
+
+export class Songwhip {
+  /**
+   * Call the songwhip API and create a shareable songwhip page
+   * @param currentUrl
+   * @returns
+   */
+  public static async whip(currentUrl: string): Promise<WhippedResult> {
+    try {
+      const response = await axios.post("https://songwhip.com/api/songwhip/create", {
+        url: currentUrl,
+        // doesn't actually matter.. returns everything the same way anyway
+        country: "NL",
+      });
+
+      return response.data;
+    } catch (error) {
+      console.log(JSON.stringify(error));
+    }
+  }
+
+  /**
+   * Transform a songwhip response into a shareable url
+   * @param response
+   * @returns
+   */
+  public static getWhipUrl(response: WhippedResult) {
+    return `https://songwhip.com${response.data.item.url}`;
+  }
+}

src/main.ts

@@ -10,7 +10,7 @@ import {
   releaseInhibitorIfActive,
 } from "./features/idleInhibitor/idleInhibitor";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
+import { Songwhip } from "./features/songwhip/songwhip";
 import { MediaInfo } from "./models/mediaInfo";
 import { MediaStatus } from "./models/mediaStatus";
 import { initRPC, rpc, unRPC } from "./scripts/discord";
@@ -250,8 +250,8 @@ ipcMain.on(globalEvents.error, (event) => {
   console.log(event);
 });
 
-ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
+ipcMain.handle(globalEvents.whip, async (event, url) => {
-  return SharingService.getUniversalLink(url);
+  return Songwhip.whip(url);
 });
 
 Logger.watch(ipcMain);

src/pages/settings/preload.ts

@@ -46,7 +46,6 @@ let adBlock: HTMLInputElement,
   singleInstance: HTMLInputElement,
   skipArtists: HTMLInputElement,
   skippedArtists: HTMLInputElement,
-  staticWindowTitle: HTMLInputElement,
   theme: HTMLSelectElement,
   trayIcon: HTMLInputElement,
   updateFrequency: HTMLInputElement,
@@ -141,9 +140,8 @@ function refreshSettings() {
     port.value = settingsStore.get(settings.apiSettings.port);
     singleInstance.checked = settingsStore.get(settings.singleInstance);
     skipArtists.checked = settingsStore.get(settings.skipArtists);
-    skippedArtists.value = settingsStore.get<string, string[]>(settings.skippedArtists).join("\n");
-    staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
     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);
     enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
@@ -263,7 +261,6 @@ window.addEventListener("DOMContentLoaded", () => {
   trayIcon = get("trayIcon");
   skipArtists = get("skipArtists");
   skippedArtists = get("skippedArtists");
-  staticWindowTitle = get("staticWindowTitle");
   singleInstance = get("singleInstance");
   updateFrequency = get("updateFrequency");
   enableListenBrainz = get("enableListenBrainz");
@@ -298,7 +295,6 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(port, settings.apiSettings.port);
   addInputListener(skipArtists, settings.skipArtists);
   addTextAreaListener(skippedArtists, settings.skippedArtists);
-  addInputListener(staticWindowTitle, settings.staticWindowTitle);
   addInputListener(singleInstance, settings.singleInstance);
   addSelectListener(theme, settings.theme);
   addInputListener(trayIcon, settings.trayIcon);

src/pages/settings/settings.html

@@ -1,34 +1,25 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<head>
   <title>Tidal Hi-Fi settings</title>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <link rel="stylesheet" href="./settings.css" />
-    <link
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-      rel="stylesheet"
+</head>
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
-    />
-  </head>
 
-  <body class="settings-window">
+<body class="settings-window">
   <div class="settings-window__wrapper">
     <div class="settings-window__drag-area"></div>
     <a id="close" class="settings-window__close-button" title="Close settings">
-        <svg
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 348.333 348.334" class="settings-window__svg-icon">
-          xmlns="http://www.w3.org/2000/svg"
+        <path fill="white" d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
-          viewBox="0 0 348.333 348.334"
-          class="settings-window__svg-icon"
-        >
-          <path
-            fill="white"
-            d="M336.559,68.611L231.016,174.165l105.543,105.549c15.699,15.705,15.699,41.145,0,56.85
             c-7.844,7.844-18.128,11.769-28.407,11.769c-10.296,0-20.581-3.919-28.419-11.769L174.167,231.003L68.609,336.563
             c-7.843,7.844-18.128,11.769-28.416,11.769c-10.285,0-20.563-3.919-28.413-11.769c-15.699-15.698-15.699-41.139,0-56.85
             l105.54-105.549L11.774,68.611c-15.699-15.699-15.699-41.145,0-56.844c15.696-15.687,41.127-15.687,56.829,0l105.563,105.554
-            L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z"
+            L279.721,11.767c15.705-15.687,41.139-15.687,56.832,0C352.258,27.466,352.258,52.912,336.559,68.611z" />
-          />
       </svg>
     </a>
 
@@ -75,13 +66,7 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-              <textarea
+            <textarea id="skippedArtists" class="textarea" cols="40" rows="5" spellcheck="false"></textarea>
-                id="skippedArtists"
-                class="textarea"
-                cols="40"
-                rows="5"
-                spellcheck="false"
-              ></textarea>
             <div class="group__option">
               <div class="group__description">
                 <h4>Block ads</h4>
@@ -121,19 +106,6 @@
                 <span class="switch__slider"></span>
               </label>
             </div>
-              <div class="group__option">
-                <div class="group__description">
-                  <h4>Static Window Title</h4>
-                  <p>
-                    Makes the window title "TIDAL Hi-Fi" instead of changing to the currently
-                    playing song.
-                  </p>
-                </div>
-                <label class="switch">
-                  <input id="staticWindowTitle" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
             <div class="group__option">
               <div class="group__description">
                 <h4>Minimize on Close</h4>
@@ -149,9 +121,7 @@
                 <h4>Hotkeys</h4>
                 <p>
                   Enable extra hotkeys to achieve feature parity with the
-                    <a class="external-link" data-url="https://defkey.com/tidal-desktop-shortcuts"
+                  <a class="external-link" data-url="https://defkey.com/tidal-desktop-shortcuts">desktop apps</a>.
-                      >desktop apps</a
-                    >.
                 </p>
               </div>
               <label class="switch">
@@ -177,8 +147,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 media
+                TIDAL Hi-Fi has a built-in web API to allow users to get current media information.
-                  information. You can optionally enable playback control as well.
+                You can optionally enable playback control as well.
               </p>
             </div>
             <div class="group__option">
@@ -200,8 +170,7 @@
             <div class="group__option">
               <div class="group__description">
                 <h4>API hostname</h4>
-                  <p>
+                <p>By default (127.0.0.1) only local apps can interface with the API. <br />
-                    By default (127.0.0.1) only local apps can interface with the API. <br />
                   Change to 0.0.0.0 to allow <strong>anyone</strong> to interact with it. <br />
                   Other options are available
                 </p>
@@ -257,6 +226,7 @@
               </label>
             </div>
             <div id="discord_options">
+
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Show Idle Text</h4>
@@ -272,27 +242,15 @@
                 <div class="group__description">
                   <h4>Idle Text</h4>
                   <p>The text displayed on Discord's rich presence while idling in the app.</p>
-                    <input
+                  <input id="discord_idle_text" type="text" class="text-input" name="discord_idle_text" />
-                      id="discord_idle_text"
-                      type="text"
-                      class="text-input"
-                      name="discord_idle_text"
-                    />
                 </div>
               </div>
 
               <div class="group__option" class="hidden">
                 <div class="group__description">
                   <h4>Using Tidal Text</h4>
-                    <p>
+                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
-                      The text displayed on Discord's rich presence while "showSong" is turned off
+                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
-                    </p>
-                    <input
-                      id="discord_using_text"
-                      type="text"
-                      class="text-input"
-                      name="discord_using_text"
-                    />
                 </div>
               </div>
 
@@ -308,6 +266,7 @@
               </div>
 
               <div id="discord_show_song_options" class="hidden">
+
                 <div class="group__option" class="hidden">
                   <div class="group__description">
                     <h4>Include timestamps</h4>
@@ -323,12 +282,7 @@
                   <div class="group__description">
                     <h4>Details prefix</h4>
                     <p>Prefix for the "details" field of Discord's rich presence.</p>
-                      <input
+                    <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
-                        id="discord_details_prefix"
-                        type="text"
-                        class="text-input"
-                        name="discord_details_prefix"
-                      />
                   </div>
                 </div>
 
@@ -336,15 +290,11 @@
                   <div class="group__description">
                     <h4>Button text</h4>
                     <p>Text to display on the button below the media information.</p>
-                      <input
+                    <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
-                        id="discord_button_text"
-                        type="text"
-                        class="text-input"
-                        name="discord_button_text"
-                      />
                   </div>
                 </div>
               </div>
+
             </div>
           </div>
           <div class="group">
@@ -363,43 +313,23 @@
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz API Url</h4>
-                    <p>
+                  <p>There are multiple instances for ListenBrainz you can set the corresponding API url below.</p>
-                      There are multiple instances for ListenBrainz you can set the corresponding
+                  <input id="ListenBrainzAPI" type="text" class="text-input" name="ListenBrainzAPI" />
-                      API url below.
-                    </p>
-                    <input
-                      id="ListenBrainzAPI"
-                      type="text"
-                      class="text-input"
-                      name="ListenBrainzAPI"
-                    />
                 </div>
               </div>
               <div class="group__option">
                 <div class="group__description">
                   <h4>ListenBrainz User Token</h4>
                   <p>Provide the user token you can get from the settings page.</p>
-                    <input
+                  <input id="ListenBrainzToken" type="text" class="text-input" name="ListenBrainzToken" />
-                      id="ListenBrainzToken"
-                      type="text"
-                      class="text-input"
-                      name="ListenBrainzToken"
-                    />
                 </div>
               </div>
             </div>
             <div class="group__description">
               <h4>ScrobbleDelay</h4>
-                <p>
+              <p>The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when you fast forward
-                  The delay (in ms) to send a listen to ListenBrainz. Prevents spamming the API when
+                immediately</p>
-                  you fast forward immediately
+              <input id="listenbrainz_delay" type="number" class="text-input" name="listenbrainz_delay" />
-                </p>
-                <input
-                  id="listenbrainz_delay"
-                  type="number"
-                  class="text-input"
-                  name="listenbrainz_delay"
-                />
             </div>
           </div>
         </section>
@@ -411,16 +341,12 @@
               <div class="group__description">
                 <h4>Update frequency</h4>
                 <p>
-                    The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback
+                  The amount of time, in milliseconds, that TIDAL Hi-Fi will refresh its playback info by scraping the
-                    info by scraping the website. The default of 500 seems to work in more cases but
+                  website.
-                    if you are fine with a bit more resource usage you can decrease it as well.
+                  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
+                <input id="updateFrequency" type="number" class="text-input" name="updateFrequency" />
-                    id="updateFrequency"
-                    type="number"
-                    class="text-input"
-                    name="updateFrequency"
-                  />
               </div>
             </div>
 
@@ -433,9 +359,7 @@
                 </p>
                 <select class="select-input" id="channel" name="channel">
                   <option value="https://listen.tidal.com">Stable (listen.tidal.com)</option>
-                    <option value="https://listen.stage.tidal.com">
+                  <option value="https://listen.stage.tidal.com">Staging (listen.stage.tidal.com)</option>
-                      Staging (listen.stage.tidal.com)
-                    </option>
                 </select>
               </div>
             </div>
@@ -481,8 +405,7 @@
               <div class="group__description">
                 <h4>Wayland support</h4>
                 <p>
-                    Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland
+                  Adds a couple of Electron flags to help TIDAL Hi-Fi run smoothly on the Wayland window system.
-                    window system.
                 </p>
               </div>
               <label class="switch">
@@ -500,19 +423,12 @@
               <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 css that you put in here will be injected into a style tag in the head of the document.
-                    the document.
                 </p>
               </div>
             </div>
           </div>
-            <textarea
+          <textarea id="customCSS" class="textarea" cols="40" rows="8" spellcheck="false"></textarea>
-              id="customCSS"
-              class="textarea"
-              cols="40"
-              rows="8"
-              spellcheck="false"
-            ></textarea>
 
           <div class="group">
             <p class="group__title">Theme files</p>
@@ -522,7 +438,9 @@
                 <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>
+                <select class="select-input" id="themesList" name="themesList">
+
+                </select>
               </div>
             </div>
 
@@ -530,20 +448,14 @@
               <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
+                  Click the button and select the css files to import. They will be added to the theme list
-                    theme list automatically.
+                  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
+                    <input id="theme-files" class="file-input" type="file" accept=".css" multiple>
-                        id="theme-files"
-                        class="file-input"
-                        type="file"
-                        accept=".css"
-                        multiple
-                      />
                   </div>
                 </div>
               </div>
@@ -555,35 +467,17 @@
           <img alt="tidal icon" class="about-section__icon" src="./icon.png" />
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
-              <a
+            <a target="_blank" rel="noopener"
-                target="_blank"
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.17.0"
-                >5.17.0</a
-              >
           </div>
           <div class="about-section__links">
-              <a
+            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
-                target="_blank"
+              class="about-section__button">Github
-                rel="noopener"
+              <i class="fa fa-external-link"></i></a>
-                href="https://github.com/mastermindzh/tidal-hifi/"
+            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/issues"
-                class="about-section__button"
+              class="about-section__button">Report an issue <i class="fa fa-external-link"></i></a>
-                >Github <i class="fa fa-external-link"></i
+            <a target="_blank" rel="noopener" href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
-              ></a>
+              class="about-section__button">Contributors <i class="fa fa-external-link"></i></a>
-              <a
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/issues"
-                class="about-section__button"
-                >Report an issue <i class="fa fa-external-link"></i
-              ></a>
-              <a
-                target="_blank"
-                rel="noopener"
-                href="https://github.com/Mastermindzh/tidal-hifi/graphs/contributors"
-                class="about-section__button"
-                >Contributors <i class="fa fa-external-link"></i
-              ></a>
           </div>
         </section>
 
@@ -595,5 +489,6 @@
       </div>
     </main>
   </div>
-  </body>
+</body>
+
 </html>

src/preload.ts

@@ -10,7 +10,7 @@ import {
 } from "./features/listenbrainz/listenbrainz";
 import { StoreData } from "./features/listenbrainz/models/storeData";
 import { Logger } from "./features/logger";
-import { SharingService } from "./features/sharingService/sharingService";
+import { Songwhip } from "./features/songwhip/songwhip";
 import { addCustomCss } from "./features/theming/theming";
 import { convertDurationToSeconds } from "./features/time/parse";
 import { MediaInfo } from "./models/mediaInfo";
@@ -48,9 +48,8 @@ const elements = {
   search: '[class^="searchField"]',
   shuffle: '*[data-test="shuffle"]',
   repeat: '*[data-test="repeat"]',
-  account: '*[data-test^="profile-image-button"]',
+  account: '*[class^="profileOptions"]',
-  settings: '*[data-test^="sidebar-menu-button"]',
+  settings: '*[data-test^="open-settings"]',
-  openSettings: '*[data-test^="open-settings"]',
   media: '*[data-test="current-media-imagery"]',
   image: "img",
   current: '*[data-test="current-time"]',
@@ -221,9 +220,9 @@ ListenBrainzStore.clear();
 function addHotKeys() {
   if (settingsStore.get(settings.enableCustomHotkeys)) {
     addHotkey("Control+p", function () {
-      elements.click("settings");
+      elements.click("account");
       setTimeout(() => {
-        elements.click("openSettings");
+        elements.click("settings");
       }, 100);
     });
     addHotkey("Control+l", function () {
@@ -255,10 +254,11 @@ function addHotKeys() {
       elements.click("repeat");
     });
     addHotkey("control+w", async function () {
-      const url = SharingService.getUniversalLink(getTrackURL());
+      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
+      const url = Songwhip.getWhipUrl(result);
       clipboard.writeText(url);
       new Notification({
-        title: `Universal link generated: `,
+        title: `Successfully whipped: `,
         body: `URL copied to clipboard: ${url}`,
       }).show();
     });
@@ -550,7 +550,6 @@ setInterval(function () {
   const artistsArray = elements.getArtistsArray();
   const artistsString = elements.getArtistsString(artistsArray);
   const songDashArtistTitle = `${title} - ${artistsString}`;
-  const staticTitle = "TIDAL Hi-Fi";
   const titleOrArtistsChanged = currentSong !== songDashArtistTitle;
   const current = elements.getText("current");
   const currentStatus = getCurrentlyPlayingStatus();
@@ -595,9 +594,7 @@ setInterval(function () {
     };
 
     // update title, url and play info with new info
-    settingsStore.get(settings.staticWindowTitle)
+    setTitle(songDashArtistTitle);
-      ? setTitle(staticTitle)
-      : setTitle(songDashArtistTitle);
     getTrackURL();
     currentSong = songDashArtistTitle;
     currentPlayStatus = currentStatus;

src/scripts/discord.ts

@@ -26,7 +26,7 @@ const defaultPresence = {
   largeImageKey: "tidal-hifi-icon",
   largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
-  type: ACTIVITY_LISTENING,
+  type: ACTIVITY_LISTENING
 };
 
 const updateActivity = () => {
@@ -118,17 +118,15 @@ const getActivity = (): SetActivity => {
 const connectWithRetry = async (retryCount = 0) => {
   try {
     await rpc.login();
-    Logger.log("Connected to Discord");
+    Logger.log('Connected to Discord');
     rpc.on("ready", updateActivity);
-    Object.values(globalEvents).forEach((event) => ipcMain.on(event, observer));
+    Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
   } catch (error) {
     if (retryCount < MAX_RETRIES) {
-      Logger.log(
+      Logger.log(`Failed to connect to Discord, retrying in ${RETRY_DELAY/1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`);
-        `Failed to connect to Discord, retrying in ${RETRY_DELAY / 1000} seconds... (Attempt ${retryCount + 1}/${MAX_RETRIES})`
-      );
       setTimeout(() => connectWithRetry(retryCount + 1), RETRY_DELAY);
     } else {
-      Logger.log("Failed to connect to Discord after maximum retry attempts");
+      Logger.log('Failed to connect to Discord after maximum retry attempts');
     }
   }
 };
@@ -137,7 +135,7 @@ const connectWithRetry = async (retryCount = 0) => {
  * Set up the discord rpc and listen on globalEvents.updateInfo
  */
 export const initRPC = () => {
-  rpc = new Client({ transport: { type: "ipc" }, clientId });
+  rpc = new Client({ transport: {type: "ipc"}, clientId });
   connectWithRetry();
 };
 

src/scripts/settings.ts

@@ -69,7 +69,6 @@ export const settingsStore = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
-    staticWindowTitle: false,
     theme: "none",
     trayIcon: true,
     updateFrequency: 500,