feat: resolve typing issues with new guards

src/contexts/report.ts

@@ -26,14 +26,7 @@ export const report: Context = {
         });
         return;
       }
-      const { guild, options, user } = interaction;
-      if (!guild) {
-        await interaction.reply({
-          content:   "You cannot report DM messages!",
-          ephemeral: true,
-        });
-        return;
-      }
+      const { options, user } = interaction;
       const message = options.getMessage("message", true);
 
       const { reportChannel } = camperChan;

src/events/handlers/handleInteractionCreate.ts

@@ -5,7 +5,6 @@ import { closePrivateChannel } from "../../modules/closePrivateChannel.js";
 import { reactionRoleClick } from "../../modules/reactionRoleClick.js";
 import { closeTicket } from "../../modules/tickets/closeTicket.js";
 import { openTicket } from "../../modules/tickets/openTicket.js";
-import { isGuildCommandInteraction } from "../../utils/typeGuards.js";
 import type { ExtendedClient } from "../../interfaces/extendedClient.js";
 
 /**
@@ -18,6 +17,13 @@ export const handleInteractionCreate = async(
   interaction: Interaction,
 ): Promise<void> => {
   if (interaction.isChatInputCommand()) {
+    if (!interaction.inCachedGuild()) {
+      await interaction.reply({
+        content:   "This command can only be used in a server, not a DM.",
+        ephemeral: true,
+      });
+      return;
+    }
     const target = camperChan.commands.find((command) => {
       return command.data.name === interaction.commandName;
     });
@@ -27,16 +33,17 @@ export const handleInteractionCreate = async(
       );
       return;
     }
-    if (!isGuildCommandInteraction(interaction)) {
-      await interaction.reply(
-        "This command can only be used in a server, not a DM.",
-      );
-      return;
-    }
     await target.run(camperChan, interaction);
   }
 
   if (interaction.isContextMenuCommand()) {
+    if (!interaction.inCachedGuild()) {
+      await interaction.reply({
+        content:   "This command can only be used in a server, not a DM.",
+        ephemeral: true,
+      });
+      return;
+    }
     const target = camperChan.contexts.find((context) => {
       return context.data.name === interaction.commandName;
     });

src/interfaces/command.ts

@@ -1,6 +1,6 @@
 import type { ExtendedClient } from "./extendedClient.js";
-import type { GuildCommandInteraction } from "./guildCommandInteraction.js";
 import type {
+  ChatInputCommandInteraction,
   SlashCommandOptionsOnlyBuilder,
   SlashCommandSubcommandsOnlyBuilder,
 } from "discord.js";
@@ -9,6 +9,6 @@ export interface Command {
   data: SlashCommandSubcommandsOnlyBuilder | SlashCommandOptionsOnlyBuilder;
   run: (
     camperChan: ExtendedClient,
-    interaction: GuildCommandInteraction
+    interaction: ChatInputCommandInteraction<"cached">
   )=> Promise<void>;
 }

src/interfaces/context.ts

@@ -8,6 +8,6 @@ export interface Context {
   };
   run: (
     camperChan: ExtendedClient,
-    interaction: ContextMenuCommandInteraction
+    interaction: ContextMenuCommandInteraction<"cached">
   )=> Promise<void>;
 }

src/interfaces/extendedClient.ts

@@ -8,8 +8,8 @@ import type {
   CategoryChannel,
   Client,
   Guild,
+  GuildTextBasedChannel,
   Snowflake,
-  TextBasedChannel,
   WebhookClient,
 } from "discord.js";
 import type { App } from "octokit";
@@ -39,7 +39,7 @@ export interface ExtendedClient extends Client {
   privateLogs:     Record<string, string>;
   db:              PrismaClient;
   homeGuild:       Guild;
-  reportChannel:   TextBasedChannel;
+  reportChannel:   GuildTextBasedChannel;
   privateCategory: CategoryChannel;
   learnAccounts:   Record<string, UserRecord & { cacheTTL: Date }>;
   event?: {

src/modules/closePrivateChannel.ts

@@ -21,7 +21,12 @@ export const closePrivateChannel = async(
   try {
     await interaction.deferReply();
     const { channel, member } = interaction;
-    if (!channel || !member || channel.type === ChannelType.DM) {
+    if (
+      !channel
+      || !member
+      || channel.type === ChannelType.DM
+      || channel.type === ChannelType.GroupDM
+    ) {
       await interaction.editReply("Cannot find your member object.");
       return;
     }