From 5e2673a6ae56873cf17fd5a944707e04f23ae8af Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 26 Jan 2022 21:45:50 +0000 Subject: [PATCH 1/3] Revert "Removed clear on pause option, discordrpc operates this way always." This reverts commit 056bad75e749038c00c62116d313088d9cbbd1fe. --- src/i18n/el_GR.jsonc | 1 + src/i18n/en_HODOR.jsonc | 1 + src/i18n/en_SGA.jsonc | 1 + src/i18n/en_US.jsonc | 1 + src/i18n/hu_HU.jsonc | 1 + src/i18n/ja_JP.jsonc | 1 + src/i18n/pt_BR.jsonc | 1 + src/i18n/tr_TR.jsonc | 1 + src/i18n/zh_CN.jsonc | 1 + src/i18n/zh_HK.jsonc | 1 + src/i18n/zh_TW.jsonc | 1 + src/main/base/store.ts | 1 + src/renderer/views/pages/settings.ejs | 11 +++++++++++ 13 files changed, 23 insertions(+) diff --git a/src/i18n/el_GR.jsonc b/src/i18n/el_GR.jsonc index e8ff606e..c277c8aa 100644 --- a/src/i18n/el_GR.jsonc +++ b/src/i18n/el_GR.jsonc @@ -215,6 +215,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "Εμφάνιση ως 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "Εμφάνιση ως 'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην Παύση", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "Καθυστέρηση LastFM Scrobble (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Ενεργοποίηση LastFM \"Now Playing\"", diff --git a/src/i18n/en_HODOR.jsonc b/src/i18n/en_HODOR.jsonc index 66c7d4a3..fb2c5865 100644 --- a/src/i18n/en_HODOR.jsonc +++ b/src/i18n/en_HODOR.jsonc @@ -228,6 +228,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "HODOR HODOR 'HODOR'", "settings.header.connectivity.discordRPC.appleMusic": "HODOR HODOR 'HODOR HODOR'", + "settings.option.connectivity.discordRPC.clearOnPause": "HODOR HODOR HODOR HODOR HODOR HODOR", // Toggle "settings.option.connectivity.lastfmScrobble": "HODOR HODOR", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "HODOR HODOR HODOR (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "HODOR HODOR HODOR HODOR", diff --git a/src/i18n/en_SGA.jsonc b/src/i18n/en_SGA.jsonc index 0541dd99..c5468e07 100644 --- a/src/i18n/en_SGA.jsonc +++ b/src/i18n/en_SGA.jsonc @@ -229,6 +229,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "↸╎ϟi!|:ᖋ॥ ᖋϟ 'ᔮ╎↸ᒷ∷'", "settings.header.connectivity.discordRPC.appleMusic": "↸╎ϟi!|:ᖋ॥ ᖋϟ 'ᖋi!i!|:ᒷ ᒲ⚍ϟ╎ᔮ'", + "settings.option.connectivity.discordRPC.clearOnPause": "ᔮ|:ᒷᖋ∷ ↸╎ϟᔮᒍ∷↸ ∷╎ᔮ⍑ i!∷ᒷϟᒷリᔮᒷ ᒍリ i!ᖋ⚍ϟᒷ", // Toggle "settings.option.connectivity.lastfmScrobble": "|:ᖋϟᒣ⎓ᒲ ϟᔮ∷ᒍᕊᕊ|:╎リ┤", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "|:ᖋϟᒣ⎓ᒲ ϟᔮ∷ᒍᕊᕊ|:ᒷ ↸ᒷ|:ᖋ॥ (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "ᒷリᖋᕊ|:ᒷ |:ᖋϟᒣ⎓ᒲ リᒍ∴ i!|:ᖋ॥╎リ┤", diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 60adc7a7..d462ef01 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -229,6 +229,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "Display as 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "Display as 'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble Delay (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Enable LastFM Now Playing", diff --git a/src/i18n/hu_HU.jsonc b/src/i18n/hu_HU.jsonc index caef4b46..d8e1f867 100644 --- a/src/i18n/hu_HU.jsonc +++ b/src/i18n/hu_HU.jsonc @@ -181,6 +181,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "Megjelenítés 'Cider'-ként", "settings.header.connectivity.discordRPC.appleMusic": "Megjelenítés 'Apple Music'-ként", + "settings.option.connectivity.discordRPC.clearOnPause": "Discord Rich Presence törlése megállításnál", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect // Refer to term.connect for the connect button diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index efde56ea..34e4fab9 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -227,6 +227,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "'Cider' を表示する", "settings.header.connectivity.discordRPC.appleMusic": "'Apple Music' を表示する", + "settings.option.connectivity.discordRPC.clearOnPause": "一時停止時にDiscord Rich Presenceをクリアする", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble Delay (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Enable LastFM Now Playing", diff --git a/src/i18n/pt_BR.jsonc b/src/i18n/pt_BR.jsonc index daa0be83..76ff31c5 100644 --- a/src/i18n/pt_BR.jsonc +++ b/src/i18n/pt_BR.jsonc @@ -194,6 +194,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "Mostrar como 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "Mostrar como 'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "Apagar Discord Rich Presence quando estiver pausado", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "Atraso dos Scrobbles do LastFM (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Ativar LastFM Now Playing", diff --git a/src/i18n/tr_TR.jsonc b/src/i18n/tr_TR.jsonc index 0303d337..82ed8257 100644 --- a/src/i18n/tr_TR.jsonc +++ b/src/i18n/tr_TR.jsonc @@ -233,6 +233,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "'Cider' Olarak", "settings.header.connectivity.discordRPC.appleMusic": "'Apple Music' Olarak", + "settings.option.connectivity.discordRPC.clearOnPause": "Duraklatıldığında Discord'da Gösterme", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Bağlantısı", // Option to Connect "settings.option.connectivity.lastfmScrobble.removeFeatured": "Albüm sanatçısını Scrobbledan kaldır(LastFM)", "settings.option.connectivity.lastfmScrobble.filterLoop": "Tekrar edilen şarkıyı filtrele (LastFM)", diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 20ec3365..e55a44e0 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -229,6 +229,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "显示正在玩 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "显示正在玩 'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "暂停时清除Discord 动态", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 记录", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延迟 (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "启用 LastFM 正在播放", diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index bea6b837..c9dcdf91 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -224,6 +224,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "顯示為'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "顯示為'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 狀態", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 記錄", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延遲 (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 LastFM 正在播放", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index 19123e11..b4151833 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -228,6 +228,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "顯示正在玩 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "顯示正在玩 'Apple Music'", + "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 動態", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 記錄", // Option to Connect "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延遲 (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 LastFM 目前聆聽", // Toggle diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 2f4bf82e..16c3b110 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -9,6 +9,7 @@ export class ConfigStore { "close_behavior": 0, // 0 = close, 1 = minimize, 2 = minimize to tray "startup_behavior": 0, // 0 = nothing, 1 = open on startup "discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music + "discordClearActivityOnPause": 1, // 0 = disabled, 1 = enabled "language" : "en_US" }, "home": { diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 08d5b200..4183a90f 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -459,6 +459,17 @@ +
+
+ {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}} +
+
+ +
+
{{$root.getLz('settings.option.connectivity.lastfmScrobble')}} From 185ac953576ebabd96dca4618a8a9c2f9fd7b4af Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 26 Jan 2022 21:49:52 +0000 Subject: [PATCH 2/3] bloaty return --- src/main/plugins/discordrpc.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index faf8c6ce..ff7a48da 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -124,9 +124,19 @@ export default class DiscordRichPresence { // Check if its pausing (false) or playing (true) if (!attributes.status) { - this._client.clearActivity() - .catch((e: any) => console.error(`[DiscordRichPresence][clearActivity] ${e}`)); + if (DiscordRichPresence._store.general.discordClearActivityOnPause == 1) { + this._client.clearActivity() + .catch((e: any) => console.error(`[DiscordRichPresence][clearActivity] ${e}`)); + } else { + this._activity.smallImageKey = 'pause'; + this._activity.smallImageText = 'Paused'; + this._client.setActivity(this._activity) + .catch((e: any) => console.error(`[DiscordRichPresence][setActivity] ${e}`)); + } + } else if (this._activity && this._activityCache !== this._activity && this._activity.details) { + this._activity.smallImageKey = 'play'; + this._activity.smallImageText = 'Playing'; this._client.setActivity(this._activity) .catch((e: any) => console.error(`[DiscordRichPresence][updateActivity] ${e}`)); this._activityCache = this._activity; From 20ccda2ea5ebb56a3309eba145fd03ef1f83b40c Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 26 Jan 2022 21:53:51 +0000 Subject: [PATCH 3/3] bloaty return --- src/main/plugins/discordrpc.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index ff7a48da..cf6f9b31 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -130,6 +130,8 @@ export default class DiscordRichPresence { } else { this._activity.smallImageKey = 'pause'; this._activity.smallImageText = 'Paused'; + delete this._activity.endTimestamp; + delete this._activity.startTimestamp; this._client.setActivity(this._activity) .catch((e: any) => console.error(`[DiscordRichPresence][setActivity] ${e}`)); }