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

Improved logic and set default value of recent PR

Browse source
This commit is contained in:
Core 2022-03-30 12:45:05 +01:00
parent be7498de84
commit e789c60dd3
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ export class Store {
"close_button_hide": false,
"discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music
"discord_rpc_clear_on_pause": true,
"discord_rpc_hide_buttons": false,
"language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
"playbackNotifications": true,
"update_branch": "main",

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

@ -33,6 +33,7 @@ export default class DiscordRichPresence {
smallImageText: '',
instance: false
};
private _clientId: number = 0;
private _activityCache: RPC.Presence = {
details: '',
@ -54,6 +55,7 @@ export default class DiscordRichPresence {
* @private
*/
private connect(clientId: any) {
this._clientId = clientId;
if (DiscordRichPresence._store.general.discord_rpc == 0) {
return
}
@ -108,7 +110,7 @@ export default class DiscordRichPresence {
/**
* Filter the Discord activity object
*/
private filterActivity(activity: any, attributes: any): Object {
private static filterActivity(activity: any, attributes: any): Object {
// Checks if the name is greater than 128 because some songs can be that long
if (activity.details && activity.details.length > 128) {
@ -134,14 +136,6 @@ export default class DiscordRichPresence {
if (!activity.largeImageText || activity.largeImageText.length < 2) {
delete activity.largeImageText
}
if (!DiscordRichPresence._store.general.discord_rpc_hide_buttons) {
activity.buttons.forEach((key: { label: string; url: string }, _v: Number) => {
if (key.url.includes('undefined') || key.url.includes('no-id-found')) {
activity.buttons.splice(key, 1);
}
});
}
return activity
}
@ -152,10 +146,8 @@ export default class DiscordRichPresence {
private updateActivity(attributes: any) {
if (DiscordRichPresence._store.general.discord_rpc == 0) {
return
}
if (!this._client) {
this.connect(DiscordRichPresence._store.general.discord_rpc == 1 ? '911790844204437504' : '886578863147192350')
} else if (!DiscordRichPresence._connection || !this._client) {
this.connect(this._clientId)
}
if (!DiscordRichPresence._connection) {
@ -164,17 +156,6 @@ export default class DiscordRichPresence {
}
// Check if show buttons is (true) or (false)
if (DiscordRichPresence._store.general.discord_rpc_hide_buttons) {
this._activity = {
details: attributes.name,
state: `${attributes.artistName ? `by ${attributes.artistName}` : ''}`,
startTimestamp: Date.now() - (attributes?.durationInMillis - attributes?.remainingTime),
endTimestamp: attributes.endTime,
largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'),
largeImageText: attributes.albumName,
instance: false
};
} else {
this._activity = {
details: attributes.name,
state: `${attributes.artistName ? `by ${attributes.artistName}` : ''}`,
@ -184,13 +165,17 @@ export default class DiscordRichPresence {
largeImageText: attributes.albumName,
instance: false, // Whether the activity is in a game session
buttons: [
{ label: 'Listen on Cider', url: attributes.url.cider },
{ label: 'View on Apple Music', url: attributes.url.appleMusic }
{label: 'Listen on Cider', url: attributes.url.cider},
{label: 'View on Apple Music', url: attributes.url.appleMusic}
] //To change attributes.url => preload/cider-preload.js
};
}
this._activity = this.filterActivity(this._activity, attributes)
if (DiscordRichPresence._store.general.discord_rpc_hide_buttons) {
this._activity.buttons = [];
}
this._activity = DiscordRichPresence.filterActivity(this._activity, attributes)
// Check if its pausing (false) or playing (true)
if (!attributes.status) {