From c1b5743b143b9970ea2afa33d605483e189083b2 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 14 Apr 2022 15:00:51 +0100 Subject: [PATCH 1/2] Small fix, hardcoded each line to set config value to what its supposed to be --- src/main/base/store.ts | 18 +++++++++++------- src/main/plugins/discordrpc.ts | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 9a5fab0b..f28f2a94 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -157,13 +157,7 @@ export class Store { "playlistTrackMapping": true } } - private migrations: any = { - '1.4.3': (store: ElectronStore) => { - if (typeof(store.get('general.discord_rpc')) == 'number') { - store.set('general.discord_rpc', this.defaults.general.discord_rpc) - } - }, - } + private migrations: any = {} constructor() { Store.cfg = new ElectronStore({ @@ -175,6 +169,16 @@ export class Store { Store.cfg.set(this.mergeStore(this.defaults, Store.cfg.store)) this.ipcHandler(); + + if (typeof(Store.cfg.get('general.discord_rpc')) != 'object') { + Store.cfg.set('general.discord_rpc', this.defaults.general.discord_rpc) + Store.cfg.set('general.discord_rpc.enabled', this.defaults.general.discord_rpc.enabled) + Store.cfg.set('general.discord_rpc.client', this.defaults.general.discord_rpc.client) + Store.cfg.set('general.discord_rpc.clear_on_pause', this.defaults.general.discord_rpc.clear_on_pause) + Store.cfg.set('general.discord_rpc.hide_buttons', this.defaults.general.discord_rpc.hide_buttons) + Store.cfg.set('general.discord_rpc.state_format', this.defaults.general.discord_rpc.state_format) + Store.cfg.set('general.discord_rpc.details_format', this.defaults.general.discord_rpc.details_format) + } } /** diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index 0fa1540e..33593c0c 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -221,8 +221,8 @@ export default class DiscordRPC { // If the user wants to keep the activity when paused if (!this._utils.getStoreValue("general.discord_rpc.clear_on_pause")) { - this._activity.smallImageKey = attributes.status ? 'pause' : 'play'; - this._activity.smallImageText = attributes.status ? 'Paused' : 'Playing'; + this._activity.smallImageKey = attributes.status ? 'play' : 'pause'; + this._activity.smallImageText = attributes.status ? 'Playing' : 'Paused'; } this.setActivity(this._activity) From 803e5f3f96a7010ac4dbc7a69c68c5b5c73af417 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Thu, 14 Apr 2022 23:45:37 +0700 Subject: [PATCH 2/2] tempfix --- src/main/base/store.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index f28f2a94..d12b168f 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -171,6 +171,7 @@ export class Store { this.ipcHandler(); if (typeof(Store.cfg.get('general.discord_rpc')) != 'object') { + Store.cfg.delete('general.discord_rpc') Store.cfg.set('general.discord_rpc', this.defaults.general.discord_rpc) Store.cfg.set('general.discord_rpc.enabled', this.defaults.general.discord_rpc.enabled) Store.cfg.set('general.discord_rpc.client', this.defaults.general.discord_rpc.client)