Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/discord tray icon incompatibility #741

Merged
merged 10 commits into from
Dec 24, 2024
Merged

Bugfix/discord tray icon incompatibility #741

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ebedcab
Fixes false positive virus detection problems with Windows build
digimezzo Dec 14, 2024
79e6df6
Initial fix
digimezzo Dec 14, 2024
3d1c6c9
Adds logging
digimezzo Dec 14, 2024
d449098
Refactoring
digimezzo Dec 14, 2024
39a132f
More refactoring
digimezzo Dec 14, 2024
5e38fb9
Smalle changes
digimezzo Dec 15, 2024
7f666b8
Some renames
digimezzo Dec 15, 2024
882ea08
Works
digimezzo Dec 15, 2024
ca77e30
Works well
digimezzo Dec 15, 2024
80aa732
Major rewrite
digimezzo Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Smalle changes
  • Loading branch information
@digimezzo
digimezzo committed Dec 15, 2024
commit 5e38fb921afc8e4f9228845893e971606e052b71
35 changes: 16 additions & 19 deletions main/api/discord-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,21 @@ export interface PresenceArgs {

export class DiscordApi {
private readonly clientId: string;
private rpc: Client;
private _client: Client;
private isReady: boolean;
private presenceToSetWhenReady: PresenceArgs | undefined;

public constructor(clientId: string) {
this.clientId = clientId;

this.reconnect();
}

private reconnect(): void {
this.rpc = new Client({ transport: 'ipc' });
this._client = new Client({ transport: 'ipc' });
this.isReady = false;

// Bind event listeners
this.rpc.on('ready', () => {
log.info('[DiscordApi] [ready] Discord RPC is ready!');
this._client.on('ready', () => {
log.info('[DiscordApi] [ready] Discord client is ready!');
this.isReady = true;

if (this.presenceToSetWhenReady) {
Expand All @@ -39,28 +37,27 @@ export class DiscordApi {
}
});

this.rpc.on('disconnected', () => {
log.info('[DiscordApi] [disconnected] Discord RPC disconnected. Attempting to reconnect...');
this._client.on('disconnected', () => {
log.info('[DiscordApi] [disconnected] Discord client disconnected. Attempting to reconnect...');
this.isReady = false;
this.login(); // Reattempt connection
this.login();
});

// Log in to Discord RPC
this.login();
}

private async login(): Promise<void> {
try {
await this.rpc.login({ clientId: this.clientId });
log.info('[DiscordApi] [login] Successfully logged into Discord RPC');
await this._client.login({ clientId: this.clientId });
log.info('[DiscordApi] [login] Successfully logged into Discord client');
} catch (error) {
log.error(`[DiscordApi] [login] Failed to log into Discord RPC: ${error}`);
log.error(`[DiscordApi] [login] Failed to log into Discord client: ${error}`);
}
}

public setPresence(args: PresenceArgs): void {
if (!this.isReady) {
log.warn('[DiscordApi] [setPresence] Discord RPC is not ready. Attempting reconnect.');
log.warn('[DiscordApi] [setPresence] Discord client is not ready. Attempting reconnect.');
this.presenceToSetWhenReady = args;
this.reconnect();

Expand All @@ -80,26 +77,26 @@ export class DiscordApi {
presence.startTimestamp = Math.floor(args.startTime / 1000);
}

this.rpc.setActivity(presence);
this._client.setActivity(presence);
log.info(`[DiscordApi] [setPresence] Rich Presence updated: ${presence.state} - ${presence.details}`);
}

public clearPresence(): void {
this.presenceToSetWhenReady = undefined;

if (!this.isReady) {
log.warn('[DiscordApi] [clearPresence] Discord RPC is not ready. Cannot clear presence.');
log.warn('[DiscordApi] [clearPresence] Discord client is not ready. Cannot clear presence.');
return;
}

this.rpc.clearActivity();
this._client.clearActivity();
log.info('[DiscordApi] [clearPresence] Rich Presence cleared.');
}

public shutdown(): void {
this.presenceToSetWhenReady = undefined;

this.rpc.destroy();
log.info('[DiscordApi] [shutdown] Discord RPC client destroyed.');
this._client.destroy();
log.info('[DiscordApi] [shutdown] Discord client destroyed.');
}
}