Fix potentially dangerous issue

DTel-HQ · May 22, 2023 · f74fa54 · f74fa54
1 parent ef7e8a5
commit f74fa54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/commands/standard/rcall.ts b/src/commands/standard/rcall.ts
@@ -55,9 +55,14 @@ export default class RCall extends Command {
 			// Number is in a call, try again
 			if (number?.outgoingCalls.length > 0 || number.incomingCalls.length > 0) continue;
 
-			const channel = await this.client.getChannel(number.channelID);
-			if (!channel) {
-				this.client.deleteNumber(number.number);
+			try {
+				const channel = await this.client.getChannel(number.channelID);
+				if (!channel) {
+					this.client.deleteNumber(number.number);
+					continue;
+				}
+			} catch {
+				// Don't delete if there's potential for an unavailable guild to delete a number
 				continue;
 			}
 

diff --git a/src/internals/client.ts b/src/internals/client.ts
@@ -96,7 +96,7 @@ class DTelClient extends Client<true> {
 		// Not safe to cache this as we won't get its updates
 		return this.channels.fetch(id, {
 			cache: false,
-		}).catch(() => null);
+		});
 	}
 
 	async getPerms(userID: string): Promise<Omit<PermissionLevel, "serverAdmin">> {