made guildid optional

Author: breadddevv

src/index.ts

@@ -57,7 +57,7 @@ for (const file of eventFiles) {
   logger.startup(`Loaded event ${file.replace(/\.[jt]s$/, '')}`);
 }
 
-await loadCommands(client, config.clientId, config.guildId, config.botToken)
+await loadCommands(client, config.clientId, config.botToken, config.guildId ?? undefined)
 
 try {
   client.login(config.botToken);

src/libs/loadCommands.ts

@@ -10,12 +10,13 @@ import {
 import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath, pathToFileURL } from "url";
+import { logger } from "./logger.js";
 
 export interface Command {
   data:
-    | SlashCommandBuilder
-    | SlashCommandSubcommandsOnlyBuilder
-    | Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">;
+  | SlashCommandBuilder
+  | SlashCommandSubcommandsOnlyBuilder
+  | Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">;
   execute: (interaction: ChatInputCommandInteraction) => Promise<void>;
 }
 
@@ -24,8 +25,8 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 export async function loadCommands(
   client: Client & { commands?: Collection<string, Command> },
   clientId: string,
-  guildId: string,
-  token: string
+  token: string,
+  guildId?: string,
 ): Promise<void> {
   client.commands = new Collection<string, Command>();
 
@@ -48,11 +49,23 @@ export async function loadCommands(
 
   const rest = new REST().setToken(token);
 
-  await rest.put(Routes.applicationGuildCommands(clientId, guildId), {
-    body: [],
-  });
+  if (clientId && guildId) {
+    logger.info("here")
+    await rest.put(Routes.applicationGuildCommands(clientId, guildId), {
+      body: [],
+    });
 
-  await rest.put(Routes.applicationGuildCommands(clientId, guildId), {
-    body: commandData,
-  });
+    await rest.put(Routes.applicationGuildCommands(clientId, guildId), {
+      body: commandData,
+    });
+  } else if (clientId) {
+    logger.info("a")
+    await rest.put(Routes.applicationCommands(clientId), {
+      body: [],
+    });
+
+    await rest.put(Routes.applicationCommands(clientId), {
+      body: commandData,
+    });
+  }
 }

src/libs/loadVariables.ts

@@ -3,14 +3,15 @@ import { logger } from "./logger.js";
 export interface Config {
   botToken: string;
   clientId: string;
-  guildId: string;
+  guildId: string | undefined;
   greetChannelId: string;
   logChannelId: string;
   databaseUrl: string;
 }
 
 function requireEnv(key: string): string {
   const value = process.env[key];
+  console.log("here")
   if (!value) {
     logger.fatal(`Missing required environment variable: ${key}`);
   }
@@ -21,7 +22,7 @@ export function loadVariables(): Config {
   return {
     botToken: requireEnv("BOT_TOKEN"),
     clientId: requireEnv("CLIENT_ID"),
-    guildId: requireEnv("GUILD_ID"),
+    guildId: process.env.GUILD_ID?.toString() ?? undefined,
     greetChannelId: requireEnv("GREET_CHANNEL_ID"),
     logChannelId: requireEnv("LOG_CHANNEL_ID"),
     databaseUrl: requireEnv("DATABASE_URL"),