From 461580c0fb31c7f7c9c238372ea4b273d18fa2ec Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+child-duckling@users.noreply.github.com> Date: Sat, 15 Jan 2022 17:21:04 -0800 Subject: [PATCH 1/4] Listen On Cider button works --- src/main/discordrpc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/discordrpc.js b/src/main/discordrpc.js index be9d302a..26e7aa3e 100644 --- a/src/main/discordrpc.js +++ b/src/main/discordrpc.js @@ -64,14 +64,14 @@ module.exports = { // console.log('[DiscordRPC][updateActivity] Updating Discord Activity.') - const listenURL = `https://applemusicelectron.com/p?id=${attributes.playParams.id}` // cider://play/s/[id] (for song) + const listenURL = `https://cider.sh/p?s&id=${attributes.playParams.id}` // cider://play/s/[id] (for song) //console.log(attributes) let ActivityObject = { details: attributes.name, state: `by ${attributes.artistName}`, startTimestamp: attributes.startTime, endTimestamp: attributes.endTime, - largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ?? 'cider', + largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ? ? 'cider', largeImageText: attributes.albumName, smallImageKey: (attributes.status ? 'play' : 'pause'), smallImageText: (attributes.status ? 'Playing' : 'Paused'), @@ -139,4 +139,4 @@ module.exports = { } }, -} +} \ No newline at end of file From 2c4a629d265095157a8c564e28b1ddc0ec9b61a8 Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:24:42 -0800 Subject: [PATCH 2/4] Update discordrpc.js --- src/main/discordrpc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/discordrpc.js b/src/main/discordrpc.js index 26e7aa3e..6e3b414c 100644 --- a/src/main/discordrpc.js +++ b/src/main/discordrpc.js @@ -71,7 +71,7 @@ module.exports = { state: `by ${attributes.artistName}`, startTimestamp: attributes.startTime, endTimestamp: attributes.endTime, - largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ? ? 'cider', + largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ?? 'cider', largeImageText: attributes.albumName, smallImageKey: (attributes.status ? 'play' : 'pause'), smallImageText: (attributes.status ? 'Playing' : 'Paused'), @@ -139,4 +139,4 @@ module.exports = { } }, -} \ No newline at end of file +} From 72df759cbde154e43a108793b11e9984afea4d1c Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sat, 15 Jan 2022 20:44:37 -0600 Subject: [PATCH 3/4] Change LastFM URL/API key to Cider. --- src/renderer/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 2f600323..8a2b6ead 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3125,7 +3125,7 @@ const app = new Vue({ LastFMAuthenticate() { console.log("wag") const element = document.getElementById('lfmConnect'); - window.open('https://www.last.fm/api/auth?api_key=174905d201451602407b428a86e8344d&cb=ame://auth/lastfm'); + window.open('https://www.last.fm/api/auth?api_key=f9986d12aab5a0fe66193c559435ede3&cb=cider://auth/lastfm'); element.innerText = 'Connecting...'; /* Just a timeout for the button */ From 015b84af6977ca4ea6c30a6fdb00e88e6ea7c4d5 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sat, 15 Jan 2022 20:53:35 -0600 Subject: [PATCH 4/4] why is this "wag" --- src/renderer/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 8a2b6ead..a680b48a 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3123,7 +3123,7 @@ const app = new Vue({ element.onclick = app.LastFMAuthenticate; }, LastFMAuthenticate() { - console.log("wag") + console.log("[LastFM] Received LastFM authentication callback") const element = document.getElementById('lfmConnect'); window.open('https://www.last.fm/api/auth?api_key=f9986d12aab5a0fe66193c559435ede3&cb=cider://auth/lastfm'); element.innerText = 'Connecting...';