mirror of
				https://github.com/Mastermindzh/tidal-hifi.git
				synced 2025-11-04 10:49:26 +01:00 
			
		
		
		
	Compare commits
	
		
			51 Commits
		
	
	
		
			5.15.0
			...
			controller
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ff4c51234b | |||
| 
						 | 
					c4ee6b51b9 | ||
| 45fe336598 | |||
| 
						 | 
					fe9f50aaf5 | ||
| 755be0ee30 | |||
| 
						 | 
					9d736b2bd9 | ||
| f4d4b1a1df | |||
| 
						 | 
					0c27c815f5 | ||
| ae699887b2 | |||
| a8c635932f | |||
| 66d0d004bf | |||
| d1e0321058 | |||
| 2ab5a556ab | |||
| baf719fc60 | |||
| 15c8f6a418 | |||
| f73521e2e5 | |||
| 
						 | 
					0f5e00c4df | ||
| 
						 | 
					974877ea4f | ||
| 
						 | 
					6be5774001 | ||
| 
						 | 
					f96cf2e8da | ||
| 
						 | 
					f832bd2712 | ||
| 
						 | 
					cb8667bd41 | ||
| 91156e5936 | |||
| 
						 | 
					57e9a2dcb8 | ||
| 
						 | 
					21edcd6ad5 | ||
| 
						 | 
					3dc42eceb0 | ||
| 
						 | 
					b1830f5684 | ||
| 
						 | 
					1a0c15e17f | ||
| 6e59d59a1d | |||
| 
						 | 
					fab7497311 | ||
| fccbcc77ea | |||
| 
						 | 
					041c19fb52 | ||
| e36c562afa | |||
| 1589aa5251 | |||
| 8c672dd1eb | |||
| 
						 | 
					3769550f24 | ||
| 
						 | 
					5a06b6c53f | ||
| 
						 | 
					1d4ef66d27 | ||
| e02f07401b | |||
| 118f92e75a | |||
| 
						 | 
					788d302ce8 | ||
| 
						 | 
					cc09f35b49 | ||
| ef13933c66 | |||
| 4f72e1b35d | |||
| 2c1c76d2d0 | |||
| e2a84e119a | |||
| 5b85e59fc3 | |||
| c3b772919a | |||
| 
						 | 
					70f2f5c248 | ||
| 
						 | 
					ffcb563b35 | ||
| 
						 | 
					2dd96dd48e | 
							
								
								
									
										1
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							@@ -14,7 +14,6 @@
 | 
			
		||||
    "rescrobbler",
 | 
			
		||||
    "scrobble",
 | 
			
		||||
    "scrobbling",
 | 
			
		||||
    "Songwhip",
 | 
			
		||||
    "trackid",
 | 
			
		||||
    "tracklist",
 | 
			
		||||
    "widevine",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -4,6 +4,19 @@ 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".
 | 
			
		||||
- Fix issue #448 Add option to disable the discord rpc idle text
 | 
			
		||||
- Notifications are now send at the end of the update process, allowing other events to happen sooner.
 | 
			
		||||
 | 
			
		||||
## [5.15.0]
 | 
			
		||||
 | 
			
		||||
- Added all missing swagger/openApi info with the help of [Times-Z](https://github.com/Times-Z)
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,6 @@ 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
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										721
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										721
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										13
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								package.json
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "tidal-hifi",
 | 
			
		||||
  "version": "5.15.0",
 | 
			
		||||
  "version": "5.17.0",
 | 
			
		||||
  "description": "Tidal on Electron with widevine(hifi) support",
 | 
			
		||||
  "main": "ts-dist/main.js",
 | 
			
		||||
  "scripts": {
 | 
			
		||||
@@ -42,21 +42,20 @@
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@electron/remote": "^2.1.2",
 | 
			
		||||
    "@types/swagger-jsdoc": "^6.0.4",
 | 
			
		||||
    "axios": "^1.7.2",
 | 
			
		||||
    "@xhayper/discord-rpc": "^1.2.0",
 | 
			
		||||
    "axios": "^1.7.9",
 | 
			
		||||
    "cors": "^2.8.5",
 | 
			
		||||
    "discord-rpc": "^4.0.1",
 | 
			
		||||
    "electron-store": "^8.2.0",
 | 
			
		||||
    "express": "^4.19.2",
 | 
			
		||||
    "hotkeys-js": "^3.13.7",
 | 
			
		||||
    "express": "^4.21.2",
 | 
			
		||||
    "hotkeys-js": "^3.13.9",
 | 
			
		||||
    "mpris-service": "^2.1.2",
 | 
			
		||||
    "request": "^2.88.2",
 | 
			
		||||
    "sass": "^1.77.7",
 | 
			
		||||
    "sass": "^1.79.4",
 | 
			
		||||
    "swagger-ui-express": "^5.0.1"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@mastermindzh/prettier-config": "^1.0.0",
 | 
			
		||||
    "@types/cors": "^2.8.17",
 | 
			
		||||
    "@types/discord-rpc": "^4.0.8",
 | 
			
		||||
    "@types/express": "^4.17.21",
 | 
			
		||||
    "@types/node": "^20.14.10",
 | 
			
		||||
    "@types/request": "^2.48.12",
 | 
			
		||||
 
 | 
			
		||||
@@ -16,8 +16,9 @@
 | 
			
		||||
    search: '[class^="searchField"]',
 | 
			
		||||
    shuffle: '*[data-test="shuffle"]',
 | 
			
		||||
    repeat: '*[data-test="repeat"]',
 | 
			
		||||
    account: '*[class^="profileOptions"]',
 | 
			
		||||
    settings: '*[data-test^="open-settings"]',
 | 
			
		||||
    account: '*[data-test^="profile-image-button"]',
 | 
			
		||||
    settings: '*[data-test^="sidebar-menu-button"]',
 | 
			
		||||
    openSettings: '*[data-test^="open-settings"]',
 | 
			
		||||
    media: '*[data-test="current-media-imagery"]',
 | 
			
		||||
    image: "img",
 | 
			
		||||
    current: '*[data-test="current-time"]',
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@ export const globalEvents = {
 | 
			
		||||
  showSettings: "showSettings",
 | 
			
		||||
  storeChanged: "storeChanged",
 | 
			
		||||
  error: "error",
 | 
			
		||||
  whip: "whip",
 | 
			
		||||
  getUniversalLink: "getUniversalLink",
 | 
			
		||||
  log: "log",
 | 
			
		||||
  toggleFavorite: "toggleFavorite",
 | 
			
		||||
  toggleShuffle: "toggleShuffle",
 | 
			
		||||
 
 | 
			
		||||
@@ -30,6 +30,7 @@ export const settings = {
 | 
			
		||||
    buttonText: "discord.buttonText",
 | 
			
		||||
    includeTimestamps: "discord.includeTimestamps",
 | 
			
		||||
    showSong: "discord.showSong",
 | 
			
		||||
    showIdle: "discord.showIdle",
 | 
			
		||||
    idleText: "discord.idleText",
 | 
			
		||||
    usingText: "discord.usingText",
 | 
			
		||||
  },
 | 
			
		||||
@@ -54,6 +55,7 @@ export const settings = {
 | 
			
		||||
  singleInstance: "singleInstance",
 | 
			
		||||
  skipArtists: "skipArtists",
 | 
			
		||||
  skippedArtists: "skippedArtists",
 | 
			
		||||
  staticWindowTitle: "staticWindowTitle",
 | 
			
		||||
  theme: "theme",
 | 
			
		||||
  trayIcon: "trayIcon",
 | 
			
		||||
  updateFrequency: "updateFrequency",
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
  "openapi": "3.1.0",
 | 
			
		||||
  "info": {
 | 
			
		||||
    "title": "TIDAL Hi-Fi API",
 | 
			
		||||
    "version": "5.15.0",
 | 
			
		||||
    "version": "5.17.0",
 | 
			
		||||
    "description": "",
 | 
			
		||||
    "license": {
 | 
			
		||||
      "name": "MIT",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										10
									
								
								src/features/sharingService/sharingService.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								src/features/sharingService/sharingService.ts
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,10 @@
 | 
			
		||||
export class SharingService {
 | 
			
		||||
  /**
 | 
			
		||||
   * Retrieve the universal link given a regular track link
 | 
			
		||||
   * @param currentUrl
 | 
			
		||||
   * @returns
 | 
			
		||||
   */
 | 
			
		||||
  public static getUniversalLink(currentUrl: string): string {
 | 
			
		||||
    return `${currentUrl}?u`;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,21 +0,0 @@
 | 
			
		||||
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;
 | 
			
		||||
}
 | 
			
		||||
@@ -1,4 +0,0 @@
 | 
			
		||||
export interface ServiceLinks {
 | 
			
		||||
  link: string;
 | 
			
		||||
  countries: string[];
 | 
			
		||||
}
 | 
			
		||||
@@ -1,27 +0,0 @@
 | 
			
		||||
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[];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
@@ -1,32 +0,0 @@
 | 
			
		||||
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}`;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -10,7 +10,7 @@ import {
 | 
			
		||||
  releaseInhibitorIfActive,
 | 
			
		||||
} from "./features/idleInhibitor/idleInhibitor";
 | 
			
		||||
import { Logger } from "./features/logger";
 | 
			
		||||
import { Songwhip } from "./features/songwhip/songwhip";
 | 
			
		||||
import { SharingService } from "./features/sharingService/sharingService";
 | 
			
		||||
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.whip, async (event, url) => {
 | 
			
		||||
  return Songwhip.whip(url);
 | 
			
		||||
ipcMain.handle(globalEvents.getUniversalLink, async (event, url) => {
 | 
			
		||||
  return SharingService.getUniversalLink(url);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
Logger.watch(ipcMain);
 | 
			
		||||
 
 | 
			
		||||
@@ -46,6 +46,7 @@ let adBlock: HTMLInputElement,
 | 
			
		||||
  singleInstance: HTMLInputElement,
 | 
			
		||||
  skipArtists: HTMLInputElement,
 | 
			
		||||
  skippedArtists: HTMLInputElement,
 | 
			
		||||
  staticWindowTitle: HTMLInputElement,
 | 
			
		||||
  theme: HTMLSelectElement,
 | 
			
		||||
  trayIcon: HTMLInputElement,
 | 
			
		||||
  updateFrequency: HTMLInputElement,
 | 
			
		||||
@@ -58,6 +59,7 @@ let adBlock: 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;
 | 
			
		||||
 | 
			
		||||
@@ -139,8 +141,9 @@ function refreshSettings() {
 | 
			
		||||
    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");
 | 
			
		||||
    staticWindowTitle.checked = settingsStore.get(settings.staticWindowTitle);
 | 
			
		||||
    theme.value = settingsStore.get(settings.theme);
 | 
			
		||||
    trayIcon.checked = settingsStore.get(settings.trayIcon);
 | 
			
		||||
    updateFrequency.value = settingsStore.get(settings.updateFrequency);
 | 
			
		||||
    enableListenBrainz.checked = settingsStore.get(settings.ListenBrainz.enabled);
 | 
			
		||||
@@ -151,6 +154,7 @@ function refreshSettings() {
 | 
			
		||||
    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);
 | 
			
		||||
 | 
			
		||||
@@ -259,6 +263,7 @@ window.addEventListener("DOMContentLoaded", () => {
 | 
			
		||||
  trayIcon = get("trayIcon");
 | 
			
		||||
  skipArtists = get("skipArtists");
 | 
			
		||||
  skippedArtists = get("skippedArtists");
 | 
			
		||||
  staticWindowTitle = get("staticWindowTitle");
 | 
			
		||||
  singleInstance = get("singleInstance");
 | 
			
		||||
  updateFrequency = get("updateFrequency");
 | 
			
		||||
  enableListenBrainz = get("enableListenBrainz");
 | 
			
		||||
@@ -269,6 +274,7 @@ window.addEventListener("DOMContentLoaded", () => {
 | 
			
		||||
  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");
 | 
			
		||||
 | 
			
		||||
@@ -292,6 +298,7 @@ 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,6 +319,7 @@ window.addEventListener("DOMContentLoaded", () => {
 | 
			
		||||
    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);
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -106,6 +106,16 @@
 | 
			
		||||
                <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>
 | 
			
		||||
@@ -227,6 +237,17 @@
 | 
			
		||||
            </div>
 | 
			
		||||
            <div id="discord_options">
 | 
			
		||||
 | 
			
		||||
              <div class="group__option" class="hidden">
 | 
			
		||||
                <div class="group__description">
 | 
			
		||||
                  <h4>Show Idle Text</h4>
 | 
			
		||||
                  <p>Should the idle text be shown when idle?</p>
 | 
			
		||||
                </div>
 | 
			
		||||
                <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>
 | 
			
		||||
@@ -457,7 +478,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.15.0">5.15.0</a>
 | 
			
		||||
              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.17.0">5.17.0</a>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div class="about-section__links">
 | 
			
		||||
            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@ import {
 | 
			
		||||
} from "./features/listenbrainz/listenbrainz";
 | 
			
		||||
import { StoreData } from "./features/listenbrainz/models/storeData";
 | 
			
		||||
import { Logger } from "./features/logger";
 | 
			
		||||
import { Songwhip } from "./features/songwhip/songwhip";
 | 
			
		||||
import { SharingService } from "./features/sharingService/sharingService";
 | 
			
		||||
import { addCustomCss } from "./features/theming/theming";
 | 
			
		||||
import { convertDurationToSeconds } from "./features/time/parse";
 | 
			
		||||
import { MediaInfo } from "./models/mediaInfo";
 | 
			
		||||
@@ -48,8 +48,9 @@ const elements = {
 | 
			
		||||
  search: '[class^="searchField"]',
 | 
			
		||||
  shuffle: '*[data-test="shuffle"]',
 | 
			
		||||
  repeat: '*[data-test="repeat"]',
 | 
			
		||||
  account: '*[class^="profileOptions"]',
 | 
			
		||||
  settings: '*[data-test^="open-settings"]',
 | 
			
		||||
  account: '*[data-test^="profile-image-button"]',
 | 
			
		||||
  settings: '*[data-test^="sidebar-menu-button"]',
 | 
			
		||||
  openSettings: '*[data-test^="open-settings"]',
 | 
			
		||||
  media: '*[data-test="current-media-imagery"]',
 | 
			
		||||
  image: "img",
 | 
			
		||||
  current: '*[data-test="current-time"]',
 | 
			
		||||
@@ -220,9 +221,9 @@ ListenBrainzStore.clear();
 | 
			
		||||
function addHotKeys() {
 | 
			
		||||
  if (settingsStore.get(settings.enableCustomHotkeys)) {
 | 
			
		||||
    addHotkey("Control+p", function () {
 | 
			
		||||
      elements.click("account");
 | 
			
		||||
      elements.click("settings");
 | 
			
		||||
      setTimeout(() => {
 | 
			
		||||
        elements.click("settings");
 | 
			
		||||
        elements.click("openSettings");
 | 
			
		||||
      }, 100);
 | 
			
		||||
    });
 | 
			
		||||
    addHotkey("Control+l", function () {
 | 
			
		||||
@@ -254,11 +255,10 @@ function addHotKeys() {
 | 
			
		||||
      elements.click("repeat");
 | 
			
		||||
    });
 | 
			
		||||
    addHotkey("control+w", async function () {
 | 
			
		||||
      const result = await ipcRenderer.invoke(globalEvents.whip, getTrackURL());
 | 
			
		||||
      const url = Songwhip.getWhipUrl(result);
 | 
			
		||||
      const url = SharingService.getUniversalLink(getTrackURL());
 | 
			
		||||
      clipboard.writeText(url);
 | 
			
		||||
      new Notification({
 | 
			
		||||
        title: `Successfully whipped: `,
 | 
			
		||||
        title: `Universal link generated: `,
 | 
			
		||||
        body: `URL copied to clipboard: ${url}`,
 | 
			
		||||
      }).show();
 | 
			
		||||
    });
 | 
			
		||||
@@ -394,18 +394,30 @@ function updateMediaInfo(mediaInfo: MediaInfo, notify: boolean) {
 | 
			
		||||
  if (mediaInfo) {
 | 
			
		||||
    currentMediaInfo = mediaInfo;
 | 
			
		||||
    ipcRenderer.send(globalEvents.updateInfo, mediaInfo);
 | 
			
		||||
    if (settingsStore.get(settings.notifications) && notify) {
 | 
			
		||||
      if (currentNotification) currentNotification.close();
 | 
			
		||||
      currentNotification = new Notification({
 | 
			
		||||
        title: mediaInfo.title,
 | 
			
		||||
        body: mediaInfo.artists,
 | 
			
		||||
        icon: mediaInfo.icon,
 | 
			
		||||
      });
 | 
			
		||||
      currentNotification.show();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    updateMpris(mediaInfo);
 | 
			
		||||
    updateListenBrainz(mediaInfo);
 | 
			
		||||
    if (notify) {
 | 
			
		||||
      sendNotification(mediaInfo);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * send a desktop notification if enabled in settings
 | 
			
		||||
 * @param mediaInfo
 | 
			
		||||
 * @param notify Whether to notify
 | 
			
		||||
 */
 | 
			
		||||
async function sendNotification(mediaInfo: MediaInfo) {
 | 
			
		||||
  if (settingsStore.get(settings.notifications)) {
 | 
			
		||||
    if (currentNotification) {
 | 
			
		||||
      currentNotification.close();
 | 
			
		||||
    }
 | 
			
		||||
    currentNotification = new Notification({
 | 
			
		||||
      title: mediaInfo.title,
 | 
			
		||||
      body: mediaInfo.artists,
 | 
			
		||||
      icon: mediaInfo.icon,
 | 
			
		||||
    });
 | 
			
		||||
    currentNotification.show();
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -538,6 +550,7 @@ 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();
 | 
			
		||||
@@ -582,7 +595,9 @@ setInterval(function () {
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    // update title, url and play info with new info
 | 
			
		||||
    setTitle(songDashArtistTitle);
 | 
			
		||||
    settingsStore.get(settings.staticWindowTitle)
 | 
			
		||||
      ? setTitle(staticTitle)
 | 
			
		||||
      : setTitle(songDashArtistTitle);
 | 
			
		||||
    getTrackURL();
 | 
			
		||||
    currentSong = songDashArtistTitle;
 | 
			
		||||
    currentPlayStatus = currentStatus;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
import { Client, Presence } from "discord-rpc";
 | 
			
		||||
import { Client, SetActivity } from "@xhayper/discord-rpc";
 | 
			
		||||
import { app, ipcMain } from "electron";
 | 
			
		||||
import { globalEvents } from "../constants/globalEvents";
 | 
			
		||||
import { settings } from "../constants/settings";
 | 
			
		||||
@@ -12,9 +12,13 @@ const clientId = "833617820704440341";
 | 
			
		||||
 | 
			
		||||
export let rpc: Client;
 | 
			
		||||
 | 
			
		||||
const ACTIVITY_LISTENING = 2;
 | 
			
		||||
const MAX_RETRIES = 5;
 | 
			
		||||
const RETRY_DELAY = 10000;
 | 
			
		||||
 | 
			
		||||
const observer = () => {
 | 
			
		||||
  if (rpc) {
 | 
			
		||||
    rpc.setActivity(getActivity());
 | 
			
		||||
    updateActivity();
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@@ -22,10 +26,20 @@ const defaultPresence = {
 | 
			
		||||
  largeImageKey: "tidal-hifi-icon",
 | 
			
		||||
  largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
 | 
			
		||||
  instance: false,
 | 
			
		||||
  type: ACTIVITY_LISTENING
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const getActivity = (): Presence => {
 | 
			
		||||
  const presence: Presence = { ...defaultPresence };
 | 
			
		||||
const updateActivity = () => {
 | 
			
		||||
  const showIdle = settingsStore.get<string, boolean>(settings.discord.showIdle) ?? true;
 | 
			
		||||
  if (mediaInfo.status === MediaStatus.paused && !showIdle) {
 | 
			
		||||
    rpc.user?.clearActivity();
 | 
			
		||||
  } else {
 | 
			
		||||
    rpc.user?.setActivity(getActivity());
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const getActivity = (): SetActivity => {
 | 
			
		||||
  const presence: SetActivity = { ...defaultPresence };
 | 
			
		||||
 | 
			
		||||
  if (mediaInfo.status === MediaStatus.paused) {
 | 
			
		||||
    presence.details =
 | 
			
		||||
@@ -41,6 +55,7 @@ const getActivity = (): Presence => {
 | 
			
		||||
        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return presence;
 | 
			
		||||
 | 
			
		||||
  function getFromStore() {
 | 
			
		||||
@@ -54,18 +69,33 @@ const getActivity = (): Presence => {
 | 
			
		||||
    return { includeTimestamps, detailsPrefix, buttonText };
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /**
 | 
			
		||||
   * Pad a string using spaces to at least 2 characters
 | 
			
		||||
   * @param input string to pad with 2 characters
 | 
			
		||||
   * @returns
 | 
			
		||||
   */
 | 
			
		||||
  function pad(input: string): string {
 | 
			
		||||
    return input.padEnd(2, " ");
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  function setPresenceFromMediaInfo(detailsPrefix: string, buttonText: string) {
 | 
			
		||||
    // discord requires a minimum of 2 characters
 | 
			
		||||
    const title = pad(mediaInfo.title);
 | 
			
		||||
    const album = pad(mediaInfo.album);
 | 
			
		||||
    const artists = pad(mediaInfo.artists);
 | 
			
		||||
 | 
			
		||||
    if (mediaInfo.url) {
 | 
			
		||||
      presence.details = `${detailsPrefix}${mediaInfo.title}`;
 | 
			
		||||
      presence.state = mediaInfo.artists ? mediaInfo.artists : "unknown artist(s)";
 | 
			
		||||
      presence.details = `${detailsPrefix}${title}`;
 | 
			
		||||
      presence.state = artists ? artists : "unknown artist(s)";
 | 
			
		||||
      presence.largeImageKey = mediaInfo.image;
 | 
			
		||||
      if (mediaInfo.album) {
 | 
			
		||||
        presence.largeImageText = mediaInfo.album;
 | 
			
		||||
      if (album) {
 | 
			
		||||
        presence.largeImageText = album;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
 | 
			
		||||
    } else {
 | 
			
		||||
      presence.details = `Watching ${mediaInfo.title}`;
 | 
			
		||||
      presence.state = mediaInfo.artists;
 | 
			
		||||
      presence.details = `Watching ${title}`;
 | 
			
		||||
      presence.state = artists;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -74,10 +104,29 @@ const getActivity = (): Presence => {
 | 
			
		||||
      const currentSeconds = convertDurationToSeconds(mediaInfo.current);
 | 
			
		||||
      const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
 | 
			
		||||
      const date = new Date();
 | 
			
		||||
      const now = (date.getTime() / 1000) | 0;
 | 
			
		||||
      const remaining = date.setSeconds(date.getSeconds() + (durationSeconds - currentSeconds));
 | 
			
		||||
      presence.startTimestamp = now;
 | 
			
		||||
      presence.endTimestamp = remaining;
 | 
			
		||||
      const now = Math.floor(date.getTime() / 1000);
 | 
			
		||||
      presence.startTimestamp = now - currentSeconds;
 | 
			
		||||
      presence.endTimestamp = presence.startTimestamp + durationSeconds;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Try to login to RPC and retry if it errors
 | 
			
		||||
 * @param retryCount Max retry count
 | 
			
		||||
 */
 | 
			
		||||
const connectWithRetry = async (retryCount = 0) => {
 | 
			
		||||
  try {
 | 
			
		||||
    await rpc.login();
 | 
			
		||||
    Logger.log('Connected to Discord');
 | 
			
		||||
    rpc.on("ready", updateActivity);
 | 
			
		||||
    Object.values(globalEvents).forEach(event => ipcMain.on(event, observer));
 | 
			
		||||
  } catch (error) {
 | 
			
		||||
    if (retryCount < MAX_RETRIES) {
 | 
			
		||||
      Logger.log(`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');
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
@@ -86,18 +135,8 @@ const getActivity = (): Presence => {
 | 
			
		||||
 * 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(getActivity());
 | 
			
		||||
      });
 | 
			
		||||
      ipcMain.on(globalEvents.updateInfo, observer);
 | 
			
		||||
    },
 | 
			
		||||
    () => {
 | 
			
		||||
      Logger.log("Can't connect to Discord, is it running?");
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
  rpc = new Client({ transport: {type: "ipc"}, clientId });
 | 
			
		||||
  connectWithRetry();
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -105,7 +144,7 @@ export const initRPC = () => {
 | 
			
		||||
 */
 | 
			
		||||
export const unRPC = () => {
 | 
			
		||||
  if (rpc) {
 | 
			
		||||
    rpc.clearActivity();
 | 
			
		||||
    rpc.user?.clearActivity();
 | 
			
		||||
    rpc.destroy();
 | 
			
		||||
    rpc = null;
 | 
			
		||||
    ipcMain.removeListener(globalEvents.updateInfo, observer);
 | 
			
		||||
 
 | 
			
		||||
@@ -43,6 +43,7 @@ export const settingsStore = new Store({
 | 
			
		||||
    enableDiscord: false,
 | 
			
		||||
    discord: {
 | 
			
		||||
      showSong: true,
 | 
			
		||||
      showIdle: true,
 | 
			
		||||
      idleText: "Browsing Tidal",
 | 
			
		||||
      usingText: "Playing media on TIDAL",
 | 
			
		||||
      includeTimestamps: true,
 | 
			
		||||
@@ -68,6 +69,7 @@ export const settingsStore = new Store({
 | 
			
		||||
    singleInstance: true,
 | 
			
		||||
    skipArtists: false,
 | 
			
		||||
    skippedArtists: [""],
 | 
			
		||||
    staticWindowTitle: false,
 | 
			
		||||
    theme: "none",
 | 
			
		||||
    trayIcon: true,
 | 
			
		||||
    updateFrequency: 500,
 | 
			
		||||
@@ -115,6 +117,9 @@ export const settingsStore = new Store({
 | 
			
		||||
        { key: settings.advanced.tidalUrl, value: "https://listen.tidal.com" },
 | 
			
		||||
      ]);
 | 
			
		||||
    },
 | 
			
		||||
    "5.16.0": (migrationStore) => {
 | 
			
		||||
      buildMigration("5.16.0", migrationStore, [{ key: settings.discord.showIdle, value: "true" }]);
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user