From 1c436c6fb7c78cc8c081c4c8aa5047402675309d Mon Sep 17 00:00:00 2001 From: Samuel Elliott Date: Sun, 31 Jul 2022 21:43:56 +0100 Subject: [PATCH] Fix not setting Discord activity on first update --- src/common/auth/nooklink.ts | 4 ++-- src/common/auth/splatnet2.ts | 2 +- src/common/presence.ts | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/auth/nooklink.ts b/src/common/auth/nooklink.ts index b571e1d..f60b558 100644 --- a/src/common/auth/nooklink.ts +++ b/src/common/auth/nooklink.ts @@ -38,7 +38,7 @@ export async function getWebServiceToken( } if (ratelimit) { - const [jwt, sig] = Jwt.decode(token); + const [jwt, sig] = Jwt.decode(token); await checkUseLimit(storage, 'nooklink', jwt.payload.sub); } @@ -116,7 +116,7 @@ export async function getUserToken( const {nooklink, data: webserviceToken} = wst; if (ratelimit) { - const [jwt, sig] = Jwt.decode(nintendoAccountToken); + const [jwt, sig] = Jwt.decode(nintendoAccountToken); await checkUseLimit(storage, 'nooklink-user', jwt.payload.sub); } diff --git a/src/common/auth/splatnet2.ts b/src/common/auth/splatnet2.ts index d24d63f..ad41e43 100644 --- a/src/common/auth/splatnet2.ts +++ b/src/common/auth/splatnet2.ts @@ -35,7 +35,7 @@ export async function getIksmToken( } if (ratelimit) { - const [jwt, sig] = Jwt.decode(token); + const [jwt, sig] = Jwt.decode(token); await checkUseLimit(storage, 'splatnet2', jwt.payload.sub); } diff --git a/src/common/presence.ts b/src/common/presence.ts index a13c363..f1371fb 100644 --- a/src/common/presence.ts +++ b/src/common/presence.ts @@ -201,8 +201,8 @@ class ZncDiscordPresenceClient { if (!connected) throw new Error('Failed to reconnect to Discord'); - this.onUpdateClient?.call(null, this.rpc.client); - this.rpc.client.setActivity(this.last_activity?.activity); + this.onUpdateClient?.call(null, this.rpc.client); + if (this.last_activity) this.rpc.client.setActivity(this.last_activity.activity); }; // @ts-expect-error @@ -210,6 +210,7 @@ class ZncDiscordPresenceClient { this.rpc = {client: client!, id: client_id}; this.onUpdateClient?.call(null, client!); + if (this.last_activity) this.rpc.client.setActivity(this.last_activity.activity); return client!; }