From 48bc7cd2d455853ee03567a816c29417baf25d06 Mon Sep 17 00:00:00 2001
From: yazninja <yazlesean@gmail.com>
Date: Fri, 28 Jan 2022 11:30:09 +0800
Subject: [PATCH] Fix discordRPC

---
 src/main/plugins/discordrpc.ts | 3 ++-
 src/preload/cider-preload.js   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index fd250617..e65c1f91 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -102,6 +102,7 @@ export default class DiscordRichPresence {
             return;
         }
         const listenURL = `https://cider.sh/p?s&id=${attributes.playParams.id}` // cider://play/s/[id] (for song)
+        const AMWebURL = `https://music.apple.com/us/song/${attributes.playParams.catalogId}`
         this._activity = {
             details: attributes.name,
             state: `${attributes.artistName ? `by ${attributes.artistName}` : ''}`,
@@ -113,7 +114,7 @@ export default class DiscordRichPresence {
             
             buttons: [
                 {label: "Listen on Cider", url: listenURL},
-                {label: "Open In Apple Music", url: attributes.songURL},
+                {label: "Open In Apple Music", url: AMWebURL},
             ]
         };
 
diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index 19a96f5c..7d921eeb 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -48,7 +48,6 @@ const MusicKitInterop = {
         attributes.name = attributes?.name ?? 'No Title Found';
         attributes.artwork = attributes?.artwork ?? { url: '' };
         attributes.artwork.url = (attributes?.artwork?.url ?? '').replace(`{f}`,"png");
-        attributes.songUrl = ('https://music.apple.com/song/' + nowPlayingItem?._songId) ?? '';
         attributes.playParams = attributes?.playParams ?? { id: 'no-id-found' };
         attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found';
         if (attributes.playParams.id === 'no-id-found') { attributes.playParams.id = nowPlayingItem?.id ?? 'no-id-found'; }