From 981f372b2d887ef055332f56c09e836ac58d04d9 Mon Sep 17 00:00:00 2001 From: coredev-uk Date: Thu, 15 Sep 2022 18:01:01 +0000 Subject: [PATCH] chore: Prettified Code [ci skip] --- src/main/base/store.ts | 4 ++-- src/main/plugins/discordrpc.ts | 39 ++++++++++++++++++---------------- src/preload/cider-preload.js | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 67000429..ad94b9e8 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -80,10 +80,10 @@ export class Store { enabled: true, first: "listenOnCider", second: "viewOnAppleMusic", - options: ["listenOnCider", "viewOnAppleMusic", "viewOnOtherMusicServices"] + options: ["listenOnCider", "viewOnAppleMusic", "viewOnOtherMusicServices"], }, }, - clear_on_pause: true + clear_on_pause: true, }, lastfm: { enabled: false, diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index b410cf2e..4340ff3e 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -232,34 +232,37 @@ export default class DiscordRPC { * Filter the Discord activity object */ private filterActivity(activity: any, attributes: any): Object { - // Handling Activity Buttons if (this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.enabled") && this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first") != "disabled") { const activityUrls: { [key: string]: any } = { - "listenOnCider": "cider", - "viewOnAppleMusic": "appleMusic", - "viewOnOtherMusicServices": "songLink" - } + listenOnCider: "cider", + viewOnAppleMusic: "appleMusic", + viewOnOtherMusicServices: "songLink", + }; - const firstActivity = {"label": this._utils.getLocale(this._utils.getStoreValue("general.language"), `settings.option.connectivity.discordRPC.buttons.${this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first")}`), "url": activityUrls[this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first")]} - const secondActivity = {"label": this._utils.getLocale(this._utils.getStoreValue("general.language"), `settings.option.connectivity.discordRPC.buttons.${this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second")}`), "url": activityUrls[this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second")]} + const firstActivity = { + label: this._utils.getLocale(this._utils.getStoreValue("general.language"), `settings.option.connectivity.discordRPC.buttons.${this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first")}`), + url: activityUrls[this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first")], + }; + const secondActivity = { + label: this._utils.getLocale(this._utils.getStoreValue("general.language"), `settings.option.connectivity.discordRPC.buttons.${this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second")}`), + url: activityUrls[this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second")], + }; if (this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second") != "disabled") { activity.buttons = [ - {"label": firstActivity.label, "url": attributes.url[firstActivity.url]}, - {"label": secondActivity.label, "url": attributes.url[secondActivity.url]} - ] - console.log(secondActivity) - console.log("Its not disabled") + { label: firstActivity.label, url: attributes.url[firstActivity.url] }, + { label: secondActivity.label, url: attributes.url[secondActivity.url] }, + ]; + console.log(secondActivity); + console.log("Its not disabled"); } else { - activity.buttons = [ - {"label": firstActivity.label, "url": attributes.url[firstActivity.url]} - ] - console.log("Its disabled") + activity.buttons = [{ label: firstActivity.label, url: attributes.url[firstActivity.url] }]; + console.log("Its disabled"); } - console.log("LOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERE") - console.log(activity.buttons) + console.log("LOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERE"); + console.log(activity.buttons); } // Add the timestamp if its playing and people want them diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index b46f541e..55a3a213 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -145,7 +145,7 @@ const MusicKitInterop = { attributes.url = { cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? nowPlayingItem?.songId ?? "no-id-found"}`, appleMusic: attributes.websiteUrl ? attributes.websiteUrl : `https://music.apple.com/${mk.storefrontId}/song/${nowPlayingItem?._songId ?? nowPlayingItem?.songId ?? "no-id-found"}`, - songLink: "https://song.link/i/" + attributes.songId + songLink: "https://song.link/i/" + attributes.songId, }; if (attributes.playParams.id === "no-id-found") { attributes.playParams.id = nowPlayingItem?.id ?? "no-id-found";