Merge 6be5774001 into 91156e5936

.vscode/settings.json

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

CHANGELOG.md

@@ -4,19 +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.18.0]
-
-- [Dianoga](https://github.com/Dianoga) fixed the duration selector, restoring mpris & partial API data.
-  - PR: #554
-- Added `xesam:url` property to mpris metadata fixes [#506](https://github.com/Mastermindzh/tidal-hifi/issues/506)
-
-## [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".

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

package-lock.json

@@ -1,22 +1,22 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.0",
+  "version": "5.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tidal-hifi",
-      "version": "5.18.0",
+      "version": "5.16.0",
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "^2.1.2",
         "@types/swagger-jsdoc": "^6.0.4",
         "@xhayper/discord-rpc": "^1.2.0",
-        "axios": "^1.7.9",
+        "axios": "^1.7.7",
         "cors": "^2.8.5",
         "electron-store": "^8.2.0",
-        "express": "^4.21.2",
+        "express": "^4.21.1",
-        "hotkeys-js": "^3.13.9",
+        "hotkeys-js": "^3.13.7",
         "mpris-service": "^2.1.2",
         "request": "^2.88.2",
         "sass": "^1.79.4",
@@ -2364,9 +2364,9 @@
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
     },
     "node_modules/axios": {
-      "version": "1.7.9",
+      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -4167,9 +4167,9 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.2",
+      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
       "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
@@ -4191,7 +4191,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -4206,10 +4206,6 @@
       },
       "engines": {
         "node": ">= 0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -5095,10 +5091,9 @@
       }
     },
     "node_modules/hotkeys-js": {
-      "version": "3.13.9",
+      "version": "3.13.7",
-      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.9.tgz",
+      "resolved": "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.7.tgz",
-      "integrity": "sha512-3TRCj9u9KUH6cKo25w4KIdBfdBfNRjfUwrljCLDC2XhmPDG0SjAZFcFZekpUZFmXzfYoGhFDcdx2gX/vUVtztQ==",
+      "integrity": "sha512-ygFIdTqqwG4fFP7kkiYlvayZppeIQX2aPpirsngkv1xM1lP0piDY5QEh68nQnIKvz64hfocxhBaD/uK3sSK1yQ==",
-      "license": "MIT",
       "funding": {
         "url": "https://jaywcjlove.github.io/#/sponsor"
       }
@@ -6690,10 +6685,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.12",
+      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
-      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidal-hifi",
-  "version": "5.18.0",
+  "version": "5.16.0",
   "description": "Tidal on Electron with widevine(hifi) support",
   "main": "ts-dist/main.js",
   "scripts": {
@@ -43,11 +43,11 @@
     "@electron/remote": "^2.1.2",
     "@types/swagger-jsdoc": "^6.0.4",
     "@xhayper/discord-rpc": "^1.2.0",
-    "axios": "^1.7.9",
+    "axios": "^1.7.7",
     "cors": "^2.8.5",
     "electron-store": "^8.2.0",
-    "express": "^4.21.2",
+    "express": "^4.21.1",
-    "hotkeys-js": "^3.13.9",
+    "hotkeys-js": "^3.13.7",
     "mpris-service": "^2.1.2",
     "request": "^2.88.2",
     "sass": "^1.79.4",

scripts/verifyElements.js

@@ -16,19 +16,17 @@
     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"]',
-    duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
+    duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
     bar: '*[data-test="progress-bar"]',
     footer: "#footerPlayer",
     mediaItem: "[data-type='mediaItem']",
-    album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
+    album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-    playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+    playingFrom: '*[class^="playingFrom"] span:nth-child(2)',
-    queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
     currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
     album_name_cell: '[class^="album"]',
     tracklist_row: '[data-test="tracklist-row"]',

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

@@ -27,10 +27,7 @@ export const settings = {
   enableDiscord: "enableDiscord",
   discord: {
     detailsPrefix: "discord.detailsPrefix",
-    buttonText: "discord.buttonText",
     includeTimestamps: "discord.includeTimestamps",
-    showSong: "discord.showSong",
-    showIdle: "discord.showIdle",
     idleText: "discord.idleText",
     usingText: "discord.usingText",
   },
@@ -55,7 +52,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.18.0",
+    "version": "5.16.0",
     "description": "",
     "license": {
       "name": "MIT",

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

@@ -20,11 +20,6 @@ const switchesWithSettings = {
     classToHide: "discord_options",
     settingsKey: settings.enableDiscord,
   },
-  discord_show_song: {
-    switch: "discord_show_song",
-    classToHide: "discord_show_song_options",
-    settingsKey: settings.discord.showSong,
-  },
 };
 
 let adBlock: HTMLInputElement,
@@ -46,7 +41,6 @@ let adBlock: HTMLInputElement,
   singleInstance: HTMLInputElement,
   skipArtists: HTMLInputElement,
   skippedArtists: HTMLInputElement,
-  staticWindowTitle: HTMLInputElement,
   theme: HTMLSelectElement,
   trayIcon: HTMLInputElement,
   updateFrequency: HTMLInputElement,
@@ -55,13 +49,7 @@ let adBlock: HTMLInputElement,
   ListenBrainzToken: HTMLInputElement,
   listenbrainz_delay: HTMLInputElement,
   enableWaylandSupport: HTMLInputElement,
-  discord_details_prefix: HTMLInputElement,
+  discord_details_prefix: HTMLInputElement
-  discord_include_timestamps: HTMLInputElement,
-  discord_button_text: HTMLInputElement,
-  discord_show_song: HTMLInputElement,
-  discord_show_idle: HTMLInputElement,
-  discord_idle_text: HTMLInputElement,
-  discord_using_text: HTMLInputElement;
 
 addCustomCss(app);
 
@@ -141,9 +129,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);
@@ -151,12 +138,6 @@ function refreshSettings() {
     ListenBrainzToken.value = settingsStore.get(settings.ListenBrainz.token);
     listenbrainz_delay.value = settingsStore.get(settings.ListenBrainz.delay);
     discord_details_prefix.value = settingsStore.get(settings.discord.detailsPrefix);
-    discord_include_timestamps.checked = settingsStore.get(settings.discord.includeTimestamps);
-    discord_button_text.value = settingsStore.get(settings.discord.buttonText);
-    discord_show_song.checked = settingsStore.get(settings.discord.showSong);
-    discord_show_idle.checked = settingsStore.get(settings.discord.showIdle);
-    discord_idle_text.value = settingsStore.get(settings.discord.idleText);
-    discord_using_text.value = settingsStore.get(settings.discord.usingText);
 
     // set state of all switches with additional settings
     Object.values(switchesWithSettings).forEach((settingSwitch) => {
@@ -263,20 +244,13 @@ window.addEventListener("DOMContentLoaded", () => {
   trayIcon = get("trayIcon");
   skipArtists = get("skipArtists");
   skippedArtists = get("skippedArtists");
-  staticWindowTitle = get("staticWindowTitle");
   singleInstance = get("singleInstance");
   updateFrequency = get("updateFrequency");
   enableListenBrainz = get("enableListenBrainz");
   ListenBrainzAPI = get("ListenBrainzAPI");
   ListenBrainzToken = get("ListenBrainzToken");
   discord_details_prefix = get("discord_details_prefix");
-  discord_include_timestamps = get("discord_include_timestamps");
   listenbrainz_delay = get("listenbrainz_delay");
-  discord_button_text = get("discord_button_text");
-  discord_show_song = get("discord_show_song");
-  discord_show_idle = get("discord_show_idle");
-  discord_using_text = get("discord_using_text");
-  discord_idle_text = get("discord_idle_text");
 
   refreshSettings();
   addInputListener(adBlock, settings.adBlock);
@@ -298,7 +272,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);
@@ -312,14 +285,4 @@ window.addEventListener("DOMContentLoaded", () => {
   addInputListener(ListenBrainzToken, settings.ListenBrainz.token);
   addInputListener(listenbrainz_delay, settings.ListenBrainz.delay);
   addInputListener(discord_details_prefix, settings.discord.detailsPrefix);
-  addInputListener(discord_include_timestamps, settings.discord.includeTimestamps);
-  addInputListener(discord_button_text, settings.discord.buttonText);
-  addInputListener(
-    discord_show_song,
-    settings.discord.showSong,
-    switchesWithSettings.discord_show_song
-  );
-  addInputListener(discord_show_idle, settings.discord.showIdle);
-  addInputListener(discord_idle_text, settings.discord.idleText);
-  addInputListener(discord_using_text, settings.discord.usingText);
 });

src/pages/settings/settings.html

@@ -106,16 +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>
@@ -236,75 +226,13 @@
               </label>
             </div>
             <div id="discord_options">
-
               <div class="group__option" class="hidden">
                 <div class="group__description">
-                  <h4>Show Idle Text</h4>
+                  <h4>Details prefix</h4>
-                  <p>Should the idle text be shown when idle?</p>
+                  <p>Prefix for the "details" field of Discord's rich presence.</p>
-                </div>
+                  <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
-                <label class="switch">
-                  <input id="discord_show_idle" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Idle Text</h4>
-                  <p>The text displayed on Discord's rich presence while idling in the app.</p>
-                  <input id="discord_idle_text" type="text" class="text-input" name="discord_idle_text" />
                 </div>
               </div>
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Using Tidal Text</h4>
-                  <p>The text displayed on Discord's rich presence while "showSong" is turned off</p>
-                  <input id="discord_using_text" type="text" class="text-input" name="discord_using_text" />
-                </div>
-              </div>
-
-              <div class="group__option" class="hidden">
-                <div class="group__description">
-                  <h4>Show media</h4>
-                  <p>Show the current media in the Discord client</p>
-                </div>
-                <label class="switch">
-                  <input id="discord_show_song" type="checkbox" />
-                  <span class="switch__slider"></span>
-                </label>
-              </div>
-
-              <div id="discord_show_song_options" class="hidden">
-
-                <div class="group__option" class="hidden">
-                  <div class="group__description">
-                    <h4>Include timestamps</h4>
-                    <p>Show current/end playtime in the Discord client</p>
-                  </div>
-                  <label class="switch">
-                    <input id="discord_include_timestamps" type="checkbox" />
-                    <span class="switch__slider"></span>
-                  </label>
-                </div>
-
-                <div class="group__option" class="hidden">
-                  <div class="group__description">
-                    <h4>Details prefix</h4>
-                    <p>Prefix for the "details" field of Discord's rich presence.</p>
-                    <input id="discord_details_prefix" type="text" class="text-input" name="discord_details_prefix" />
-                  </div>
-                </div>
-
-                <div class="group__option">
-                  <div class="group__description">
-                    <h4>Button text</h4>
-                    <p>Text to display on the button below the media information.</p>
-                    <input id="discord_button_text" type="text" class="text-input" name="discord_button_text" />
-                  </div>
-                </div>
-              </div>
-
             </div>
           </div>
           <div class="group">
@@ -478,7 +406,7 @@
           <h4>TIDAL Hi-Fi</h4>
           <div class="about-section__version">
             <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.0">5.18.0</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.16.0">5.16.0</a>
           </div>
           <div class="about-section__links">
             <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
@@ -501,4 +429,4 @@
   </div>
 </body>
 
-</html>
+</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,18 +48,17 @@ 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"]',
-  duration: '*[class^=_playbackControlsContainer] *[data-test="duration"]',
+  duration: '*[class^=playbackControlsContainer] *[data-test="duration"]',
   bar: '*[data-test="progress-bar"]',
   footer: "#footerPlayer",
   mediaItem: "[data-type='mediaItem']",
-  album_header_title: '*[class^="_playingFrom"] span:nth-child(2)',
+  album_header_title: '*[class^="playingFrom"] span:nth-child(2)',
-  playing_from: '*[class^="_playingFrom"] span:nth-child(2)',
+  playing_from: '*[class^="playingFrom"] span:nth-child(2)',
   queue_album: "*[class^=playQueueItemsContainer] *[class^=groupTitle] span:nth-child(2)",
   currentlyPlaying: "[class^='isPlayingIcon'], [data-test-is-playing='true']",
   album_name_cell: '[class^="album"]',
@@ -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();
     });
@@ -483,7 +483,6 @@ function updateMpris(mediaInfo: MediaInfo) {
         "xesam:title": mediaInfo.title,
         "xesam:artist": [mediaInfo.artists],
         "xesam:album": mediaInfo.album,
-        "xesam:url": mediaInfo.url,
         "mpris:artUrl": mediaInfo.image,
         "mpris:length": convertDuration(mediaInfo.duration) * 1000 * 1000,
         "mpris:trackid": "/org/mpris/MediaPlayer2/track/" + getTrackID(),
@@ -551,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();
@@ -596,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

@@ -23,15 +23,14 @@ const observer = () => {
 };
 
 const defaultPresence = {
-  largeImageKey: "tidal-hifi-icon",
+  smallImageKey: "tidal-hifi-icon",
-  largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
+  smallImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
   instance: false,
   type: ACTIVITY_LISTENING
 };
 
 const updateActivity = () => {
-  const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
+  if (mediaInfo.status === MediaStatus.paused) {
-  if (mediaInfo.status === MediaStatus.paused && !showIdle) {
     rpc.user?.clearActivity();
   } else {
     rpc.user?.setActivity(getActivity());
@@ -41,34 +40,11 @@ const updateActivity = () => {
 const getActivity = (): SetActivity => {
   const presence: SetActivity = { ...defaultPresence };
 
-  if (mediaInfo.status === MediaStatus.paused) {
+  includeTimeStamps();
-    presence.details =
+  setPresenceFromMediaInfo();
-      settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
-  } else {
-    const showSong = settingsStore.get<string, boolean>(settings.discord.showSong) ?? false;
-    if (showSong) {
-      const { includeTimestamps, detailsPrefix, buttonText } = getFromStore();
-      includeTimeStamps(includeTimestamps);
-      setPresenceFromMediaInfo(detailsPrefix, buttonText);
-    } else {
-      presence.details =
-        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
-    }
-  }
 
   return presence;
 
-  function getFromStore() {
-    const includeTimestamps =
-      settingsStore.get<string, boolean>(settings.discord.includeTimestamps) ?? true;
-    const detailsPrefix =
-      settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
-    const buttonText =
-      settingsStore.get<string, string>(settings.discord.buttonText) ?? "Play on TIDAL";
-
-    return { includeTimestamps, detailsPrefix, buttonText };
-  }
-
   /**
    * Pad a string using spaces to at least 2 characters
    * @param input string to pad with 2 characters
@@ -78,35 +54,28 @@ const getActivity = (): SetActivity => {
     return input.padEnd(2, " ");
   }
 
-  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
+  function setPresenceFromMediaInfo() {
     // discord requires a minimum of 2 characters
     const title = pad(mediaInfo.title);
     const album = pad(mediaInfo.album);
     const artists = pad(mediaInfo.artists);
 
+    const detailsPrefix = settingsStore.get<string, string>(settings.discord.detailsPrefix) ?? "Listening to ";
+    presence.details = `${detailsPrefix}${title}`;
+    presence.state = artists ? artists : "unknown artist(s)";
     if (mediaInfo.url) {
-      presence.details = `${detailsPrefix}${title}`;
-      presence.state = artists ? artists : "unknown artist(s)";
       presence.largeImageKey = mediaInfo.image;
-      if (album) {
+      if (album) presence.largeImageText = album;
-        presence.largeImageText = album;
-      }
-
-      presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
-    } else {
-      presence.details = `Watching ${title}`;
-      presence.state = artists;
     }
   }
 
-  function includeTimeStamps(includeTimestamps: boolean) {
+  function includeTimeStamps() {
-    if (includeTimestamps) {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
-      const now = Math.trunc((Date.now() + 500) / 1000);
+      const date = new Date();
+      const now = Math.floor(date.getTime() / 1000);
       presence.startTimestamp = now - currentSeconds;
       presence.endTimestamp = presence.startTimestamp + durationSeconds;
-    }
   }
 };
 

src/scripts/settings.ts

@@ -42,13 +42,10 @@ export const settingsStore = new Store({
     enableCustomHotkeys: false,
     enableDiscord: false,
     discord: {
-      showSong: true,
-      showIdle: true,
       idleText: "Browsing Tidal",
       usingText: "Playing media on TIDAL",
       includeTimestamps: true,
       detailsPrefix: "Listening to ",
-      buttonText: "Play on Tidal",
     },
     ListenBrainz: {
       enabled: false,
@@ -69,7 +66,6 @@ export const settingsStore = new Store({
     singleInstance: true,
     skipArtists: false,
     skippedArtists: [""],
-    staticWindowTitle: false,
     theme: "none",
     trayIcon: true,
     updateFrequency: 500,
@@ -90,16 +86,8 @@ export const settingsStore = new Store({
         migrationStore.get(settings.ListenBrainz.delay) ?? 5000
       );
     },
-    "5.8.0": (migrationStore) => {
-      console.log("running migrations for 5.8.0");
-      migrationStore.set(
-        settings.discord.includeTimestamps,
-        migrationStore.get(settings.discord.includeTimestamps) ?? true
-      );
-    },
     "5.9.0": (migrationStore) => {
       buildMigration("5.9.0", migrationStore, [
-        { key: settings.discord.showSong, value: "true" },
         { key: settings.discord.idleText, value: "Browsing Tidal" },
         {
           key: settings.discord.usingText,
@@ -116,10 +104,7 @@ export const settingsStore = new Store({
       buildMigration("5.15.0", migrationStore, [
         { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
       ]);
-    },
+    }
-    "5.16.0": (migrationStore) => {
-      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
-    },
   },
 });