Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-04-25 07:27:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save presence data so start timestamp is not reset when restarting the app

Browse Source
This commit is contained in:
Samuel Elliott 2022-09-07 10:39:28 +01:00
parent 66c8efdb96
commit 87071dd5c3
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/notify.ts
View File

@ -301,8 +301,9 @@ export class NotificationManager {
type = PresenceEvent.TITLE_STATE_CHANGE;
callback = 'onFriendTitleStateChange';
debugFriends('%s title %s state changed%s, now %s %s, was %s %s',
friend.name, currenttitle.name, friend.presence.state,
debugFriends('%s title %s state changed, now %s %s, was %s %s',
friend.name, currenttitle.name,
friend.presence.state, JSON.stringify(currenttitle.sysDescription),
lastpresence.state, JSON.stringify(lasttitle.sysDescription));
}
} else if (!consolewasonline && friend.presence.state !== PresenceState.OFFLINE) {

46
src/common/presence.ts
View File

@ -15,6 +15,12 @@ const debugSplatnet2 = createDebug('nxapi:nso:presence:splatnet2');
const MAX_CONNECT_ATTEMPTS = Infinity; // 10
const RECONNECT_INTERVAL = 5000; // 5 seconds
interface SavedPresence {
presence: Presence;
title_since: number;
created_at: number;
}
class ZncDiscordPresenceClient {
rpc: {client: DiscordRpcClient, id: string} | null = null;
title: {id: string; since: number} | null = null;
@ -226,7 +232,9 @@ class ZncDiscordPresenceClient {
this.rpc = null;
await client.destroy();
}
}
if (this.update_presence_errors > 10) {
this.title = null;
}
}
@ -266,9 +274,15 @@ export class ZncDiscordPresence extends ZncNotifications {
throw new Error('User "' + this.presence_user + '" is not friends with this user');
}
await this.restorePresenceForTitleUpdateAt(friend.nsaId, friend.presence);
await this.discord.updatePresenceForDiscord(friend.presence, friend);
await this.savePresenceForTitleUpdateAt(friend.nsaId, friend.presence, this.discord.title?.since);
} else {
await this.restorePresenceForTitleUpdateAt(user!.nsaId, user!.presence);
await this.discord.updatePresenceForDiscord(user!.presence, user, user!.links.friendCode, activeevent);
await this.savePresenceForTitleUpdateAt(user!.nsaId, user!.presence, this.discord.title?.since);
}
}
@ -302,9 +316,11 @@ export class ZncDiscordPresence extends ZncNotifications {
await this.discord.updatePresenceForDiscord(null);
} else {
await this.discord.updatePresenceForDiscord(friend.presence, friend);
await this.savePresenceForTitleUpdateAt(friend.nsaId, friend.presence, this.discord.title?.since);
}
} else {
await this.discord.updatePresenceForDiscord(user!.presence, user, user!.links.friendCode, activeevent);
await this.savePresenceForTitleUpdateAt(user!.nsaId, user!.presence, this.discord.title?.since);
}
}
@ -312,6 +328,36 @@ export class ZncDiscordPresence extends ZncNotifications {
if (user) await this.updatePresenceForSplatNet2Monitors([user]);
}
saved_presence = new Map<string, number>();
async savePresenceForTitleUpdateAt(id: string, presence: Presence, title_since = Date.now()) {
if (this.saved_presence.get(id) === presence.updatedAt) return;
const saved_presence: SavedPresence = {
presence,
title_since,
created_at: Date.now(),
};
await this.storage.setItem('LastPresence.' + id, saved_presence);
this.saved_presence.set(id, presence.updatedAt);
}
async restorePresenceForTitleUpdateAt(id: string, presence: Presence) {
const saved_presence: SavedPresence | undefined = await this.storage.getItem('LastPresence.' + id);
if (!saved_presence) return;
if (saved_presence.presence.updatedAt !== presence.updatedAt) return;
if (!('name' in presence.game)) return;
const title_id = getTitleIdFromEcUrl(presence.game.shopUri);
if (!title_id) return;
if (!('name' in saved_presence.presence.game) ||
getTitleIdFromEcUrl(saved_presence.presence.game.shopUri) !== title_id) return;
this.discord.title = {id: title_id, since: saved_presence.title_since};
}
async handleError(err: ErrorResponse<CoralErrorResponse> | NodeJS.ErrnoException): Promise<LoopResult> {
this.discord.onError(err);