Refactor GuildCreate and GuildDelete event handlers

appujet · Dec 31, 2023 · 19daad3 · 19daad3
1 parent 06d4054
commit 19daad3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/events/client/GuildCreate.ts b/src/events/client/GuildCreate.ts
@@ -11,9 +11,16 @@ export default class GuildCreate extends Event {
     public async run(guild: Guild): Promise<any> {
         let owner: GuildMember | undefined;
         try {
-            owner = await guild.fetchOwner();
+            owner = guild.members.cache.get(guild?.ownerId);
         } catch (e) {
-            owner = await guild.members.fetch(guild.ownerId);
+            owner = await guild.fetchOwner();
+        }
+        if (!owner) {
+            owner = {
+                user: {
+                    tag: 'Unknown#0000',
+                },
+            } as GuildMember;
         }
         const embed = new EmbedBuilder()
             .setColor(this.client.config.color.green)

diff --git a/src/events/client/GuildDelete.ts b/src/events/client/GuildDelete.ts
@@ -11,9 +11,16 @@ export default class GuildDelete extends Event {
     public async run(guild: Guild): Promise<any> {
         let owner: GuildMember | undefined;
         try {
-            owner = await guild.fetchOwner();
+            owner = guild.members.cache.get(guild?.ownerId);
         } catch (e) {
-            owner = await guild.members.fetch(guild.ownerId);
+            owner = await guild.fetchOwner();
+        }
+        if (!owner) {
+            owner = {
+                user: {
+                    tag: 'Unknown#0000',
+                },
+            } as GuildMember;
         }
         const embed = new EmbedBuilder()
             .setColor(this.client.config.color.red)