refactor(gan): extract shared scaffolding from /gan and /gan2 slash commands (#57)

Author: wescopeland

src/slash-commands/gan.command.ts

@@ -1,10 +1,8 @@
 import { SlashCommandBuilder } from "discord.js";
 
 import type { SlashCommand } from "../models";
-import { GameInfoService } from "../services/game-info.service";
 import { TemplateService } from "../services/template.service";
-import { fetchGanData } from "../utils/fetch-gan-data";
-import { logError } from "../utils/logger";
+import { runGanCommand } from "./shared/run-gan-command";
 
 const ganSlashCommand: SlashCommand = {
   data: new SlashCommandBuilder()
@@ -17,49 +15,20 @@ const ganSlashCommand: SlashCommand = {
         .setRequired(true),
     ),
 
-  legacyName: "gan", // For migration mapping - using the most common alias
+  legacyName: "gan", // For migration mapping - using the most common alias.
 
   async execute(interaction, _client) {
-    await interaction.deferReply();
-
-    const gameInput = interaction.options.getString("game-id", true);
-
-    // Extract game ID from argument.
-    const gameId = GameInfoService.extractGameId(gameInput);
-    if (!gameId) {
-      await interaction.editReply(
-        "Invalid game ID or URL format. Please provide a game ID number or a RetroAchievements game URL.",
-      );
-
-      return;
-    }
-
-    try {
-      const ganData = await fetchGanData(gameId);
-      if (!ganData) {
-        await interaction.editReply(
-          `Unable to get info from the game ID \`${gameId}\`... :frowning:`,
-        );
-
-        return;
-      }
-
-      const template = TemplateService.generateGanTemplate(
-        ganData.gameInfo,
-        ganData.achievementSetDate,
-        ganData.youtubeLink,
-        ganData.gameId,
-      );
-
-      await interaction.editReply({
-        content: `Here's your achievement-news post template:\n${template}`,
-      });
-    } catch (error) {
-      logError("Error in gan slash command:", { error });
-      await interaction.editReply(
-        `Unable to get info from the game ID \`${gameId}\`... :frowning:`,
-      );
-    }
+    await runGanCommand(interaction, {
+      commandName: "gan",
+      render: (ganData) => ({
+        content: `Here's your achievement-news post template:\n${TemplateService.generateGanTemplate(
+          ganData.gameInfo,
+          ganData.achievementSetDate,
+          ganData.youtubeLink,
+          ganData.gameId,
+        )}`,
+      }),
+    });
   },
 };
 

src/slash-commands/gan2.command.ts

@@ -1,10 +1,8 @@
 import { SlashCommandBuilder } from "discord.js";
 
 import type { SlashCommand } from "../models";
-import { GameInfoService } from "../services/game-info.service";
 import { TemplateService } from "../services/template.service";
-import { fetchGanData } from "../utils/fetch-gan-data";
-import { logError } from "../utils/logger";
+import { runGanCommand } from "./shared/run-gan-command";
 
 const gan2SlashCommand: SlashCommand = {
   data: new SlashCommandBuilder()
@@ -18,45 +16,17 @@ const gan2SlashCommand: SlashCommand = {
     ),
 
   async execute(interaction, _client) {
-    await interaction.deferReply();
-
-    const gameInput = interaction.options.getString("game-id", true);
-
-    // Extract game ID from argument.
-    const gameId = GameInfoService.extractGameId(gameInput);
-    if (!gameId) {
-      await interaction.editReply(
-        "Invalid game ID or URL format. Please provide a game ID number or a RetroAchievements game URL.",
-      );
-
-      return;
-    }
-
-    try {
-      const ganData = await fetchGanData(gameId);
-      if (!ganData) {
-        await interaction.editReply(
-          `Unable to get info from the game ID \`${gameId}\`... :frowning:`,
-        );
-
-        return;
-      }
-
-      const output = TemplateService.generateGan2Template(
-        ganData.gameInfo,
-        ganData.achievementSetDate,
-        ganData.youtubeLink,
-        ganData.gameId,
-        interaction.user,
-      );
-
-      await interaction.editReply(output);
-    } catch (error) {
-      logError("Error in gan2 slash command:", { error });
-      await interaction.editReply(
-        `Unable to get info from the game ID \`${gameId}\`... :frowning:`,
-      );
-    }
+    await runGanCommand(interaction, {
+      commandName: "gan2",
+      render: (ganData, ix) =>
+        TemplateService.generateGan2Template(
+          ganData.gameInfo,
+          ganData.achievementSetDate,
+          ganData.youtubeLink,
+          ganData.gameId,
+          ix.user,
+        ),
+    });
   },
 };
 

src/slash-commands/shared/run-gan-command.ts

@@ -0,0 +1,50 @@
+import type { ChatInputCommandInteraction, InteractionEditReplyOptions } from "discord.js";
+
+import { GameInfoService } from "../../services/game-info.service";
+import type { GanData } from "../../utils/fetch-gan-data";
+import { fetchGanData } from "../../utils/fetch-gan-data";
+import { logError } from "../../utils/logger";
+
+type GanReplyPayload = string | InteractionEditReplyOptions;
+
+type GanRenderer = (ganData: GanData, interaction: ChatInputCommandInteraction) => GanReplyPayload;
+
+interface RunGanCommandOptions {
+  commandName: "gan" | "gan2";
+  render: GanRenderer;
+}
+
+export const runGanCommand = async (
+  interaction: ChatInputCommandInteraction,
+  { commandName, render }: RunGanCommandOptions,
+): Promise<void> => {
+  await interaction.deferReply();
+
+  const gameInput = interaction.options.getString("game-id", true);
+
+  const gameId = GameInfoService.extractGameId(gameInput);
+  // Preserve the original falsy check: extractGameId("0") returns 0, which should be treated as invalid.
+  if (!gameId) {
+    await interaction.editReply(
+      "Invalid game ID or URL format. Please provide a game ID number or a RetroAchievements game URL.",
+    );
+
+    return;
+  }
+
+  try {
+    const ganData = await fetchGanData(gameId);
+    if (!ganData) {
+      await interaction.editReply(
+        `Unable to get info from the game ID \`${gameId}\`... :frowning:`,
+      );
+
+      return;
+    }
+
+    await interaction.editReply(render(ganData, interaction));
+  } catch (error) {
+    logError(`Error in ${commandName} slash command:`, { error });
+    await interaction.editReply(`Unable to get info from the game ID \`${gameId}\`... :frowning:`);
+  }
+};