Merge branch 'master' into feat/quoi-feur

codinglab-io · Sep 4, 2023 · d9cb95a · d9cb95a
2 parents 6b7d6b0 + 9221e88
commit d9cb95a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/core/checkUniqueSlashCommandNames.ts b/src/core/checkUniqueSlashCommandNames.ts
@@ -1,9 +1,7 @@
-import type { BotModule } from '../types/bot';
+import type { BotCommand } from '../types/bot';
 
-export const checkUniqueSlashCommandNames = (modulesToLoad: Record<string, BotModule>) => {
-  const slashCommandNames = Object.values(modulesToLoad)
-    .flatMap((module) => module.slashCommands ?? [])
-    .map((command) => command.schema.name);
+export const checkUniqueSlashCommandNames = (botCommands: BotCommand[]) => {
+  const slashCommandNames = botCommands.map((command) => command.schema.name);
   const uniqueSlashCommandNames = new Set(slashCommandNames);
   if (uniqueSlashCommandNames.size !== slashCommandNames.length) {
     throw new Error('Found duplicate slash command names');

diff --git a/src/core/loadModules.ts b/src/core/loadModules.ts
@@ -10,8 +10,7 @@ export const loadModules = async (
   modulesToLoad: Record<string, BotModule>,
 ): Promise<void> => {
   const botCommands = Object.values(modulesToLoad).flatMap((module) => module.slashCommands ?? []);
-
-  checkUniqueSlashCommandNames(modulesToLoad);
+  checkUniqueSlashCommandNames(botCommands);
   routeCommands(client, botCommands);
   await pushCommands(botCommands.map((command) => command.schema));
 

diff --git a/src/main.ts b/src/main.ts
@@ -12,6 +12,7 @@ const client = new Client({
 await client.login(discord.token);
 await new Promise<void>((resolve) => {
   client.on('ready', () => {
+    Object.values(modules).map((module) => module.eventHandlers?.ready?.(client));
     resolve();
   });
 });