okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Prettified Code

Browse source 
[ci skip]
This commit is contained in:
coredev-uk 2022-09-15 18:01:01 +00:00 • committed by cider-chore[bot]
parent 6ee309a6c5
commit 981f372b2d
3 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/base/store.ts
View file

@ -80,10 +80,10 @@ export class Store {
enabled: true, enabled: true,
first: "listenOnCider", first: "listenOnCider",
second: "viewOnAppleMusic", second: "viewOnAppleMusic",
options: ["listenOnCider", "viewOnAppleMusic", "viewOnOtherMusicServices"] options: ["listenOnCider", "viewOnAppleMusic", "viewOnOtherMusicServices"],
}, },
}, },
clear_on_pause: true clear_on_pause: true,
}, },
lastfm: { lastfm: {
enabled: false, enabled: false,

39
src/main/plugins/discordrpc.ts
View file

@ -232,34 +232,37 @@ export default class DiscordRPC {
* Filter the Discord activity object * Filter the Discord activity object
*/ */
private filterActivity(activity: any, attributes: any): Object { private filterActivity(activity: any, attributes: any): Object {
// Handling Activity Buttons // Handling Activity Buttons
if (this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.enabled") && this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.first") != "disabled") { 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 } = { const activityUrls: { [key: string]: any } = {
"listenOnCider": "cider", listenOnCider: "cider",
"viewOnAppleMusic": "appleMusic", viewOnAppleMusic: "appleMusic",
"viewOnOtherMusicServices": "songLink" 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 firstActivity = {
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")]} 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") { if (this._utils.getStoreValue("connectivity.discord_rpc.activity.buttons.second") != "disabled") {
activity.buttons = [ activity.buttons = [
{"label": firstActivity.label, "url": attributes.url[firstActivity.url]}, { label: firstActivity.label, url: attributes.url[firstActivity.url] },
{"label": secondActivity.label, "url": attributes.url[secondActivity.url]} { label: secondActivity.label, url: attributes.url[secondActivity.url] },
] ];
console.log(secondActivity) console.log(secondActivity);
console.log("Its not disabled") console.log("Its not disabled");
} else { } else {
activity.buttons = [ activity.buttons = [{ label: firstActivity.label, url: attributes.url[firstActivity.url] }];
{"label": firstActivity.label, "url": attributes.url[firstActivity.url]} console.log("Its disabled");
]
console.log("Its disabled")
} }
console.log("LOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERE") console.log("LOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERELOOK HERE");
console.log(activity.buttons) console.log(activity.buttons);
} }
// Add the timestamp if its playing and people want them // Add the timestamp if its playing and people want them

2
src/preload/cider-preload.js
View file

@ -145,7 +145,7 @@ const MusicKitInterop = {
attributes.url = { attributes.url = {
cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? nowPlayingItem?.songId ?? "no-id-found"}`, 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"}`, 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") { if (attributes.playParams.id === "no-id-found") {
attributes.playParams.id = nowPlayingItem?.id ?? "no-id-found"; attributes.playParams.id = nowPlayingItem?.id ?? "no-id-found";