refactor: extract duplicated patterns into shared helpers

src/commands/about.ts

@@ -1,9 +1,10 @@
-import { EmbedBuilder, MessageFlags, SlashCommandBuilder } from "discord.js";
+import { EmbedBuilder, SlashCommandBuilder } from "discord.js";
 
 import type { Client, CommandInteraction, User } from "discord.js";
 
 import env from "../utils/env.js";
 import logger from "../utils/logger.js";
+import { safeErrorReply } from "../utils/commandErrors.js";
 
 export const slashCommand = new SlashCommandBuilder()
   .setName("about")
@@ -76,12 +77,7 @@ export async function execute(client: Client, interaction: CommandInteraction) {
       command: "about",
     });
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }
 

src/commands/admin/activity/create.ts

@@ -5,6 +5,7 @@ import type { CommandInteractionOptionResolver } from "discord.js";
 import type { DiscordActivityType } from "../../../database/schema.js";
 
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { discordActivities } from "../../../database/schema.js";
@@ -73,11 +74,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/activity/list.ts

@@ -5,6 +5,7 @@ import { desc } from "drizzle-orm";
 import type { DiscordActivity } from "../../../database/schema.js";
 
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { discordActivities } from "../../../database/schema.js";
@@ -68,11 +69,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/activity/remove.ts

@@ -5,6 +5,7 @@ import type { CommandInteractionOptionResolver } from "discord.js";
 import { eq } from "drizzle-orm";
 
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { discordActivities } from "../../../database/schema.js";
@@ -71,12 +72,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content:
-          "An error occurred while deleting the activity. Please try again.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/index.ts

@@ -10,6 +10,7 @@ import type {
   CommandInteractionOptionResolver,
 } from "discord.js";
 import logger from "../../utils/logger.js";
+import { safeErrorReply } from "../../utils/commandErrors.js";
 
 /**
  * Import subcommands
@@ -290,12 +291,7 @@ export async function execute(client: Client, interaction: CommandInteraction) {
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }
 

src/commands/admin/quote/create.ts

@@ -10,8 +10,9 @@ import type { CommandInteractionOptionResolver } from "discord.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { motivationQuotes } from "../../../database/schema.js";
-import env from "../../../utils/env.js";
 import logger from "../../../utils/logger.js";
+import { sendToMainChannel } from "../../../utils/mainChannel.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 
 export default async function (
   client: Client,
@@ -83,18 +84,7 @@ export default async function (
       })
       .setTimestamp();
 
-    if (env.MAIN_CHANNEL_ID) {
-      const channel = await client.channels.fetch(env.MAIN_CHANNEL_ID);
-      if (channel?.isTextBased() && !channel.isDMBased()) {
-        await channel.send({ embeds: [embed] });
-      } else {
-        logger.warn("Admin", "Main channel not found or not text-based", {
-          channelId: env.MAIN_CHANNEL_ID,
-        });
-      }
-    } else {
-      logger.warn("Admin", "MAIN_CHANNEL_ID not configured");
-    }
+    await sendToMainChannel(client, { embeds: [embed] });
 
     await interaction.reply({
       content: `Quote created with id: ${newQuote.id}`,
@@ -114,11 +104,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/quote/list.ts

@@ -5,6 +5,7 @@ import { desc } from "drizzle-orm";
 import type { MotivationQuote } from "../../../database/schema.js";
 
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { motivationQuotes } from "../../../database/schema.js";
@@ -67,11 +68,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/quote/remove.ts

@@ -12,7 +12,8 @@ import logger from "../../../utils/logger.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { motivationQuotes } from "../../../database/schema.js";
-import env from "../../../utils/env.js";
+import { sendToMainChannel } from "../../../utils/mainChannel.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 
 export default async function (
   client: Client,
@@ -49,15 +50,10 @@ export default async function (
 
     await db.delete(motivationQuotes).where(eq(motivationQuotes.id, quoteId));
 
-    // send message to main channel
-    if (env.MAIN_CHANNEL_ID) {
-      const mainChannel = await client.channels.fetch(env.MAIN_CHANNEL_ID);
-      if (mainChannel?.isTextBased() && !mainChannel.isDMBased()) {
-        await mainChannel.send(
-          `Quote deleted by ${interaction.user.username} with id: ${quoteId}`
-        );
-      }
-    }
+    await sendToMainChannel(
+      client,
+      `Quote deleted by ${interaction.user.username} with id: ${quoteId}`
+    );
 
     await interaction.reply({
       content: `Quote deleted with id: ${quoteId}`,
@@ -77,11 +73,6 @@ export default async function (
       err
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/suggestion/approve.ts

@@ -12,8 +12,9 @@ import { eq } from "drizzle-orm";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { motivationQuotes, suggestionQuotes } from "../../../database/schema.js";
-import env from "../../../utils/env.js";
 import logger from "../../../utils/logger.js";
+import { sendToMainChannel } from "../../../utils/mainChannel.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 
 export default async function (
   client: Client,
@@ -88,12 +89,7 @@ export default async function (
       .setFooter({ text: `Suggestion ID: ${suggestionId}` })
       .setTimestamp();
 
-    if (env.MAIN_CHANNEL_ID) {
-      const channel = await client.channels.fetch(env.MAIN_CHANNEL_ID);
-      if (channel?.isTextBased() && !channel.isDMBased()) {
-        await channel.send({ embeds: [embed] });
-      }
-    }
+    await sendToMainChannel(client, { embeds: [embed] });
 
     try {
       const submitter = await client.users.fetch(suggestion.addedBy);
@@ -135,11 +131,6 @@ export default async function (
       err,
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/suggestion/list.ts

@@ -6,6 +6,7 @@ import { eq, desc } from "drizzle-orm";
 import type { SuggestionQuote } from "../../../database/schema.js";
 
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { suggestionQuotes } from "../../../database/schema.js";
@@ -73,11 +74,6 @@ export default async function (
       err,
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/suggestion/reject.ts

@@ -12,8 +12,9 @@ import { eq, and } from "drizzle-orm";
 import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { suggestionQuotes } from "../../../database/schema.js";
-import env from "../../../utils/env.js";
 import logger from "../../../utils/logger.js";
+import { sendToMainChannel } from "../../../utils/mainChannel.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 
 export default async function (
   client: Client,
@@ -98,12 +99,7 @@ export default async function (
       .setFooter({ text: `Suggestion ID: ${suggestionId}` })
       .setTimestamp();
 
-    if (env.MAIN_CHANNEL_ID) {
-      const channel = await client.channels.fetch(env.MAIN_CHANNEL_ID);
-      if (channel?.isTextBased() && !channel.isDMBased()) {
-        await channel.send({ embeds: [embed] });
-      }
-    }
+    await sendToMainChannel(client, { embeds: [embed] });
 
     try {
       const submitter = await client.users.fetch(suggestion.addedBy);
@@ -148,11 +144,6 @@ export default async function (
       err,
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/admin/suggestion/stats.ts

@@ -6,6 +6,7 @@ import { isUserPermitted } from "../../../utils/permissions.js";
 import { db } from "../../../database/index.js";
 import { suggestionQuotes } from "../../../database/schema.js";
 import logger from "../../../utils/logger.js";
+import { safeErrorReply } from "../../../utils/commandErrors.js";
 
 export default async function (
   _client: Client,
@@ -71,11 +72,6 @@ export default async function (
       err,
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }

src/commands/changelog.ts

@@ -3,6 +3,7 @@ import { SlashCommandBuilder, EmbedBuilder, MessageFlags } from "discord.js";
 import type { Client, CommandInteraction } from "discord.js";
 
 import logger from "../utils/logger.js";
+import { safeErrorReply } from "../utils/commandErrors.js";
 
 export const slashCommand = new SlashCommandBuilder()
   .setName("changelog")
@@ -81,12 +82,7 @@ export async function execute(_client: Client, interaction: CommandInteraction)
       }
     );
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }
 

src/commands/help.ts

@@ -3,6 +3,7 @@ import type { Client, CommandInteraction } from "discord.js";
 import { SlashCommandBuilder, MessageFlags } from "discord.js";
 
 import logger from "../utils/logger.js";
+import { safeErrorReply } from "../utils/commandErrors.js";
 
 export const slashCommand = new SlashCommandBuilder()
   .setName("help")
@@ -47,12 +48,7 @@ export async function execute(_client: Client, interaction: CommandInteraction)
       command: "help",
     });
 
-    if (!interaction.replied && !interaction.deferred) {
-      await interaction.reply({
-        content: "An error occurred while processing your request.",
-        flags: MessageFlags.Ephemeral,
-      });
-    }
+    await safeErrorReply(interaction);
   }
 }