Removed redundant RPC settings

src/scripts/discord.ts

@@ -21,14 +21,14 @@ const observer = () => {
 };
 
 const defaultPresence = {
-  largeImageKey: "tidal-hifi-icon",
-  largeImageText: `TIDAL Hi-Fi ${app.getVersion()}`,
+  smallImageKey: "tidal-hifi-icon",
+  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 && !showIdle) {
+  if (mediaInfo.status === MediaStatus.paused) {
     rpc.user?.clearActivity();
   } else {
     rpc.user?.setActivity(getActivity());
@@ -38,36 +38,11 @@ const updateActivity = () => {
 const getActivity = (): SetActivity => {
   const presence: SetActivity = { ...defaultPresence };
 
-  presence.type = ACTIVITY_LISTENING;
-
-  if (mediaInfo.status === MediaStatus.paused) {
-    presence.details =
-      settingsStore.get<string, string>(settings.discord.idleText) ?? "Browsing Tidal";
-  } else {
-    const showSong = settingsStore.get<string, boolean>(settings.discord.showSong) ?? false;
-    if (showSong) {
-      const { includeTimestamps, detailsPrefix, buttonText } = getFromStore();
-      includeTimeStamps(includeTimestamps);
-      setPresenceFromMediaInfo(detailsPrefix, buttonText);
-    } else {
-      presence.details =
-        settingsStore.get<string, string>(settings.discord.usingText) ?? "Playing media on TIDAL";
-    }
-  }
+  includeTimeStamps();
+  setPresenceFromMediaInfo();
 
   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
@@ -77,36 +52,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) {
-        presence.largeImageText = album;
-      }
-
-      presence.buttons = [{ label: buttonText, url: mediaInfo.url }];
-    } else {
-      presence.details = `Watching ${title}`;
-      presence.state = artists;
+      if (album) presence.largeImageText = album;
     }
   }
 
-  function includeTimeStamps(includeTimestamps: boolean) {
-    if (includeTimestamps) {
+  function includeTimeStamps() {
       const currentSeconds = convertDurationToSeconds(mediaInfo.current);
       const durationSeconds = convertDurationToSeconds(mediaInfo.duration);
       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,
@@ -89,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,
@@ -115,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" }]);
-    },
+    }
   },
 });