Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-03-21 18:04:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply saved configuration when enabling Discord presence

Browse Source
This commit is contained in:
Samuel Elliott 2022-09-21 16:11:16 +01:00
parent c7fbe15047
commit f4447e6014
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/main/monitor.ts
View File

@ -22,7 +22,7 @@ export class PresenceMonitorManager {
public app: App
) {}
async start(id: string, callback?: (monitor: EmbeddedPresenceMonitor, firstRun: boolean) => void) {
async start(id: string, callback?: (monitor: EmbeddedPresenceMonitor, firstRun: boolean) => Promise<void> | void) {
debug('Starting monitor', id);
const token = id.length === 16 ? await this.app.store.storage.getItem('NintendoAccountToken.' + id) : id;
@ -32,7 +32,7 @@ export class PresenceMonitorManager {
const existing = this.monitors.find(m => m instanceof EmbeddedPresenceMonitor && m.data.user.id === user.data.user.id);
if (existing) {
callback?.call(null, existing as EmbeddedPresenceMonitor, false);
await callback?.call(null, existing as EmbeddedPresenceMonitor, false);
return existing;
}
@ -72,7 +72,7 @@ export class PresenceMonitorManager {
this.monitors.push(i);
callback?.call(null, i, true);
await callback?.call(null, i, true);
i.enable();
@ -297,9 +297,10 @@ export class PresenceMonitorManager {
}
if (source && 'na_id' in source) {
await this.start(source.na_id, monitor => {
await this.start(source.na_id, async monitor => {
monitor.presence_user = source.friend_nsa_id ?? monitor.data.nsoAccount.user.nsaId;
if (existing) this.setDiscordPresenceSourceCopyConfiguration(monitor, existing);
else await this.setDiscordPresenceSourceRestoreSavedConfiguration(monitor);
callback?.call(null, monitor);
monitor.discord.refreshExternalMonitorsConfig();
monitor.skipIntervalInCurrentLoop();
@ -307,6 +308,7 @@ export class PresenceMonitorManager {
} else if (source && 'url' in source) {
const monitor = await this.startUrl(source.url);
if (existing) this.setDiscordPresenceSourceCopyConfiguration(monitor, existing);
else await this.setDiscordPresenceSourceRestoreSavedConfiguration(monitor);
callback?.call(null, monitor);
}
@ -317,6 +319,16 @@ export class PresenceMonitorManager {
}
}
private async setDiscordPresenceSourceRestoreSavedConfiguration(
monitor: EmbeddedPresenceMonitor | EmbeddedProxyPresenceMonitor
) {
const config: Omit<DiscordPresenceConfiguration, 'source'> | undefined =
await this.app.store.storage.getItem('AppDiscordPresenceOptions');
if (!config) return;
this.setDiscordPresenceConfigurationForMonitor(monitor, config);
}
private setDiscordPresenceSourceCopyConfiguration(
monitor: EmbeddedPresenceMonitor | EmbeddedProxyPresenceMonitor,
existing: EmbeddedPresenceMonitor | EmbeddedProxyPresenceMonitor,