Merge pull request #24 from DynamicaBot/sebasptsch/issue17

Better command and event structure

src/deploy-commands.ts

@@ -18,7 +18,7 @@ if (!TOKEN || !CLIENT_ID) {
 
   (async () => {
     try {
-      logger.info("Started refreshing application (/) commands.");
+      await logger.info("Started refreshing application (/) commands.");
       if (GUILD_ID) {
         await rest.put(Routes.applicationGuildCommands(CLIENT_ID, GUILD_ID), {
           body: commandList,
@@ -29,9 +29,9 @@ if (!TOKEN || !CLIENT_ID) {
         });
       }
 
-      logger.info("Successfully reloaded application (/) commands.");
+      await logger.info("Successfully reloaded application (/) commands.");
     } catch (error) {
-      logger.error(error);
+      await logger.error(error);
     }
   })();
 }

src/events/command.ts

@@ -0,0 +1,24 @@
+import { CommandInteraction } from "discord.js";
+import * as commands from "../commands";
+import { ErrorEmbed } from "../lib/discordEmbeds";
+import { logger } from "../lib/logger";
+import { event } from "./event";
+
+export const commandListener: event = {
+  name: "interactionCreate",
+  once: false,
+  async execute(interaction: CommandInteraction) {
+    if (!interaction.isCommand()) return;
+    try {
+      await commands[interaction.commandName].execute(interaction);
+    } catch (e) {
+      logger.error(e);
+      interaction.reply({
+        embeds: [
+          ErrorEmbed("There was an error while executing this command!"),
+        ],
+        ephemeral: true,
+      });
+    }
+  },
+};

src/index.ts

@@ -1,8 +1,6 @@
 import { Client, Intents } from "discord.js";
 import dotenv from "dotenv";
-import * as commands from "./commands";
 import * as events from "./events";
-import { ErrorEmbed } from "./lib/discordEmbeds";
 import { logger } from "./lib/logger";
 import { db } from "./lib/prisma";
 import { scheduler } from "./lib/scheduler";
@@ -17,29 +15,9 @@ const client = new Client({
   ],
 });
 
-const commandList = Object.values(commands);
-client.on("interactionCreate", async (interaction) => {
-  if (!interaction.isCommand()) return;
-
-  const command = commandList.find(
-    (command) => command.data.name === interaction.commandName
-  );
-
-  if (!command) return;
-
-  try {
-    await command.execute(interaction);
-  } catch (e) {
-    logger.error(e);
-    interaction.reply({
-      embeds: [ErrorEmbed("There was an error while executing this command!")],
-      ephemeral: true,
-    });
-  }
-});
-
 const eventList = Object.values(events);
 
+// Register event handlers
 for (const event of eventList) {
   if (event.once) {
     client.once(event.name, (...args: any) => event.execute(...args));
@@ -51,6 +29,7 @@ for (const event of eventList) {
 // Login to Discord with your client's token
 client.login(process.env.TOKEN);
 
+// Handle stop signal
 process.on("SIGINT", () => {
   client.destroy();
   scheduler.stop();