From 8d724dad3589cb11da95aab637b7f10c29654777 Mon Sep 17 00:00:00 2001 From: mihai <45673304+mihaicm93@users.noreply.github.com> Date: Mon, 2 Mar 2026 16:25:32 +0100 Subject: [PATCH 1/3] fix: Server deletion client lockup Signed-off-by: mihai <45673304+mihaicm93@users.noreply.github.com> --- src/classes/Server.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/classes/Server.ts b/src/classes/Server.ts index 72218942..a63d6e25 100644 --- a/src/classes/Server.ts +++ b/src/classes/Server.ts @@ -136,9 +136,10 @@ export class Server { * Channels */ get channels(): Channel[] { - return [ - ...this.#collection.getUnderlyingObject(this.id).channelIds.values(), - ] + const channelIds = this.#collection.getUnderlyingObject(this.id).channelIds; + if (!channelIds) return []; + + return [...channelIds.values()] .map((id) => this.#collection.client.channels.get(id)!) .filter((x) => x); } @@ -338,6 +339,7 @@ export class Server { * Permission the currently authenticated user has against this server */ get permission(): bigint { + if (!this.$exists) return 0n; return calculatePermission(this.#collection.client, this); } From 2237dfb4cda395d1e9190ce920f8dd5103ac20e8 Mon Sep 17 00:00:00 2001 From: mihai <45673304+mihaicm93@users.noreply.github.com> Date: Mon, 2 Mar 2026 18:41:49 +0100 Subject: [PATCH 2/3] fix: lint errors Signed-off-by: mihai <45673304+mihaicm93@users.noreply.github.com> --- src/events/EventClient.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/events/EventClient.ts b/src/events/EventClient.ts index dd1e3866..f5d2c786 100644 --- a/src/events/EventClient.ts +++ b/src/events/EventClient.ts @@ -94,8 +94,11 @@ export class EventClient< #pongTimeoutReference: number | undefined; #connectTimeoutReference: number | undefined; - #lastError: // eslint-disable-next-line @typescript-eslint/no-explicit-any - { type: "socket"; data: any } | { type: "revolt"; data: Error } | undefined; + #lastError: + // eslint-disable-next-line @typescript-eslint/no-explicit-any + | { type: "socket"; data: any } + | { type: "revolt"; data: Error } + | undefined; /** * Create a new event client. @@ -302,4 +305,4 @@ export class EventClient< | undefined { return this.#lastError; } -} +} \ No newline at end of file From 9946e3320eacca85f966b4e83284f9df12b24dc0 Mon Sep 17 00:00:00 2001 From: mihai <45673304+mihaicm93@users.noreply.github.com> Date: Mon, 2 Mar 2026 18:44:01 +0100 Subject: [PATCH 3/3] fix lint error Signed-off-by: mihai <45673304+mihaicm93@users.noreply.github.com> --- src/events/EventClient.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/events/EventClient.ts b/src/events/EventClient.ts index f5d2c786..dd1e3866 100644 --- a/src/events/EventClient.ts +++ b/src/events/EventClient.ts @@ -94,11 +94,8 @@ export class EventClient< #pongTimeoutReference: number | undefined; #connectTimeoutReference: number | undefined; - #lastError: - // eslint-disable-next-line @typescript-eslint/no-explicit-any - | { type: "socket"; data: any } - | { type: "revolt"; data: Error } - | undefined; + #lastError: // eslint-disable-next-line @typescript-eslint/no-explicit-any + { type: "socket"; data: any } | { type: "revolt"; data: Error } | undefined; /** * Create a new event client. @@ -305,4 +302,4 @@ export class EventClient< | undefined { return this.#lastError; } -} \ No newline at end of file +}