From 287560d5caf7b132b9f138b517d3f9e0edbf74fc Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 15:39:10 +0200 Subject: [PATCH 1/7] add elapsed time back to RPC so people can see addiction --- src/ts/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ts/index.ts b/src/ts/index.ts index 0584aa8..861008f 100644 --- a/src/ts/index.ts +++ b/src/ts/index.ts @@ -208,7 +208,8 @@ $(() => { DiscordRPC.setActivity({ details: 'In-Game', largeImageKey: 'game', - largeImageText: 'An Anime Game Launcher' + largeImageText: 'An Anime Game Launcher', + startTimestamp: new Date().setDate(new Date().getDate()) }); } From a0f1e681f162cb1da695f9f6707f2ae668fb6420 Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 19:44:59 +0200 Subject: [PATCH 2/7] install @types/discord-rpc --- package.json | 1 + src/ts/lib/DiscordRPC.ts | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index f7304d9..997b2f2 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ } }, "devDependencies": { + "@types/discord-rpc": "^4.0.0", "electron": "^14.0.0", "electron-builder": "^22.13.1", "sass": "^1.41.0", diff --git a/src/ts/lib/DiscordRPC.ts b/src/ts/lib/DiscordRPC.ts index c43296b..56e40e8 100644 --- a/src/ts/lib/DiscordRPC.ts +++ b/src/ts/lib/DiscordRPC.ts @@ -1,4 +1,4 @@ -const discordRpc = require('discord-rpc'); +import discordRpc, { Client } from 'discord-rpc'; export class DiscordRPC { @@ -8,7 +8,7 @@ export class DiscordRPC public static init () { - this.rpc = new discordRpc.Client({ transport: 'ipc' }); + this.rpc = new discordRpc.Client({ transport: 'ipc' }) as Client; this.rpc.login({ clientId: this.clientId }).catch(console.error); @@ -24,10 +24,11 @@ export class DiscordRPC public static setActivity (activity: any): void { - this.rpc?.setActivity({ - startTimestamp: parseInt(new Date().setDate(new Date().getDate()).toString()), - instance: false, - ...activity + this.rpc.setActivity({ + ...activity, + ...{ + instance: false + } }); } @@ -38,9 +39,9 @@ export class DiscordRPC public static close (): void { - this.rpc?.clearActivity(); - this.rpc?.destroy(); + this.rpc.clearActivity(); + this.rpc.destroy(); - this.rpc = null; + this.rpc = null as any; } } From 21ad52904c22286a99b1a7188117cb9d04ab736b Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 19:47:30 +0200 Subject: [PATCH 3/7] Change types --- src/ts/lib/DiscordRPC.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ts/lib/DiscordRPC.ts b/src/ts/lib/DiscordRPC.ts index 56e40e8..a693707 100644 --- a/src/ts/lib/DiscordRPC.ts +++ b/src/ts/lib/DiscordRPC.ts @@ -1,4 +1,4 @@ -import discordRpc, { Client } from 'discord-rpc'; +import discordRpc, { Client, Presence } from 'discord-rpc'; export class DiscordRPC { @@ -22,7 +22,7 @@ export class DiscordRPC }); } - public static setActivity (activity: any): void + public static setActivity (activity: Presence): void { this.rpc.setActivity({ ...activity, From d876b779ad987910c5a0b21e7f6fda483695c5fd Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 19:48:05 +0200 Subject: [PATCH 4/7] remove instance --- src/ts/lib/DiscordRPC.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ts/lib/DiscordRPC.ts b/src/ts/lib/DiscordRPC.ts index a693707..0eb18e9 100644 --- a/src/ts/lib/DiscordRPC.ts +++ b/src/ts/lib/DiscordRPC.ts @@ -16,8 +16,7 @@ export class DiscordRPC this.rpc.setActivity({ details: 'Preparing to launch', largeImageKey: 'launcher', - largeImageText: 'An Anime Game Launcher', - instance: false + largeImageText: 'An Anime Game Launcher' }); }); } From 6b4107b69218c5a6beb2e2a950f25d86e4c5b40b Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 19:49:54 +0200 Subject: [PATCH 5/7] remove clearActivity as it isn't needed --- src/ts/lib/DiscordRPC.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ts/lib/DiscordRPC.ts b/src/ts/lib/DiscordRPC.ts index 0eb18e9..c86c327 100644 --- a/src/ts/lib/DiscordRPC.ts +++ b/src/ts/lib/DiscordRPC.ts @@ -38,7 +38,6 @@ export class DiscordRPC public static close (): void { - this.rpc.clearActivity(); this.rpc.destroy(); this.rpc = null as any; From 7baef05f26a774696d6678e12ef82af96fae4610 Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 19:56:41 +0200 Subject: [PATCH 6/7] Fix an issue --- src/ts/lib/DiscordRPC.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ts/lib/DiscordRPC.ts b/src/ts/lib/DiscordRPC.ts index c86c327..0eb18e9 100644 --- a/src/ts/lib/DiscordRPC.ts +++ b/src/ts/lib/DiscordRPC.ts @@ -38,6 +38,7 @@ export class DiscordRPC public static close (): void { + this.rpc.clearActivity(); this.rpc.destroy(); this.rpc = null as any; From b37bba9be4935527fbc2970115c2a46709d38c4f Mon Sep 17 00:00:00 2001 From: Maroxy Date: Sun, 24 Oct 2021 20:14:41 +0200 Subject: [PATCH 7/7] Fix Discord RPC --- src/ts/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ts/index.ts b/src/ts/index.ts index 861008f..aba80b1 100644 --- a/src/ts/index.ts +++ b/src/ts/index.ts @@ -40,8 +40,8 @@ $(() => { ipcRenderer.on('rpc-toggle', () => { DiscordRPC.isActive() ? - DiscordRPC.init() : - DiscordRPC.close(); + DiscordRPC.close() : + DiscordRPC.init(); }); // FIXME