fixes BOT-14

mrhappyma · Mar 28, 2024 · 0ef2d50 · 0ef2d50
1 parent 56d1746
commit 0ef2d50
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/modules/deliver.ts b/src/modules/deliver.ts
@@ -87,9 +87,15 @@ bot.registerButton(/order:(\d+):deliver/, async (interaction) => {
       ephemeral: true,
     });
 
-  const targetChannel = await (
-    await bot.client.guilds.fetch(orderP.guildId)
-  ).channels.fetch(orderP.channelId);
+  try {
+    var guild = await bot.client.guilds.fetch(orderP.guildId);
+  } catch (e) {
+    return interaction.followUp({
+      content: `Failed to fetch guild! This usually means the bot was kicked, and if so just reject the order. Here's the error:\n\`\`\`${e}\`\`\``,
+      ephemeral: true,
+    });
+  }
+  const targetChannel = guild.channels.cache.get(orderP.channelId);
   if (!targetChannel?.isTextBased() || targetChannel.isThread())
     return interaction.followUp({ content: "Failed to fetch order channel" });
   try {