fix: loading errors

onesoft-sudo · Jan 28, 2024 · 14dec5a · 14dec5a
1 parent 7062fdd
commit 14dec5a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,6 @@
     "description": "A Discord bot for moderation purposes.",
     "version": "7.25.0",
     "main": "build/index.js",
-    "type": "module",
     "license": "GPL-3.0-or-later",
     "keywords": [
         "bot",

diff --git a/scripts/deploy-commands.js b/scripts/deploy-commands.js
@@ -65,7 +65,9 @@ function makeContextMenuCommandBuilder(command) {
             intents: []
         });
 
-        await client.loadCommands();
+        await client.boot({
+            events: false
+        });
 
         for (const [name, command] of client.commands) {
             if (name.includes("__") || client.commands.get(name)?.name !== name) continue;

diff --git a/src/core/Client.ts b/src/core/Client.ts
@@ -18,7 +18,7 @@
  */
 
 import { PrismaClient } from "@prisma/client";
-import { Collection, ClientEvents as DiscordClientEvents, Client as DiscordJSClient } from "discord.js";
+import { Collection, ClientEvents as DiscordClientEvents, Client as DiscordJSClient, GuildEmoji } from "discord.js";
 import path from "node:path";
 import Server from "../api/Server";
 import type AIAutoModService from "../automod/AIAutoModService";
@@ -67,6 +67,7 @@ import ServiceManager from "./ServiceManager";
 class Client<R extends boolean = boolean> extends DiscordJSClient<R> {
     private readonly eventListeners = new Map<string, Function[]>();
     public readonly commands = new Collection<string, Command>();
+    public readonly emojiMap = new Map<string, GuildEmoji>();
 
     public readonly prisma = new PrismaClient({
         errorFormat: "pretty",
@@ -173,6 +174,10 @@ class Client<R extends boolean = boolean> extends DiscordJSClient<R> {
         }
     }
 
+    async getHomeGuild() {
+        return this.guilds.cache.get(process.env.HOME_GUILD_ID) ?? (await this.guilds.fetch(process.env.HOME_GUILD_ID));
+    }
+
     addEventListener<K extends keyof ClientEvents>(name: K, listener: (...args: ClientEvents[K]) => unknown) {
         const handlers = this.eventListeners.get(name) ?? [];
 
@@ -201,6 +206,22 @@ class Client<R extends boolean = boolean> extends DiscordJSClient<R> {
         const handler = handlers.splice(index, 1)[0];
         this.off(name as keyof DiscordClientEvents, handler as (...args: DiscordClientEvents[keyof DiscordClientEvents]) => void);
     }
+
+    emitWaitLocal<K extends keyof ClientEvents>(name: K, ...args: ClientEvents[K]) {
+        return new Promise<void>(async (resolve, reject) => {
+            for (const listener of this.eventListeners.get(name) ?? []) {
+                await listener(...args);
+            }
+
+            resolve();
+        });
+    }
+
+    emitWait<K extends keyof ClientEvents>(name: K, ...args: ClientEvents[K]) {
+        for (const listener of this.eventListeners.get(name) ?? []) {
+            listener(...args);
+        }
+    }
 }
 
 export default Client;
diff --git a/src/index.ts b/src/index.ts
@@ -128,12 +128,12 @@ const promise = (async () => {
 
     await client.boot();
 
-    // if (process.env.SERVER_ONLY_MODE) {
-    //     await client.server.boot();
-    //     await client.server.start();
-    // } else {
-    //     await client.login(process.env.TOKEN);
-    // }
+    if (process.env.SERVER_ONLY_MODE) {
+        await client.server.boot();
+        await client.server.start();
+    } else {
+        await client.login(process.env.TOKEN);
+    }
 })();
 
 export default promise;
diff --git a/src/services/CommandManager.ts b/src/services/CommandManager.ts
@@ -214,7 +214,7 @@ export default class CommandManager extends Service {
             }
         };
 
-        await this.client.emitWait("command", command.name, handlerObject, command, message, context);
+        await this.client.emitWaitLocal("command", command.name, handlerObject, command, message, context);
         await Promise.resolve();
 
         if (handlerObject._stopped) {