fix: remove useless env variables (#72)

Author: luca-montaigut

.env.example

@@ -1,13 +1,10 @@
 # SETUP
 DISCORD_TOKEN=
-DISCORD_CLIENT_ID=
-DISCORD_GUILD_ID=
 
 # DB
 REDIS_URL=
 
 # CHANNELS
-BLABLA_CHANNEL_ID=
 COOL_LINKS_CHANNEL_ID=
 
 # API

src/config.ts

@@ -3,8 +3,6 @@ import env from 'env-var';
 export const config = {
   discord: {
     token: env.get('DISCORD_TOKEN').required().asString(),
-    clientId: env.get('DISCORD_CLIENT_ID').required().asString(),
-    guildId: env.get('DISCORD_GUILD_ID').required().asString(),
     coolLinksChannelId: env.get('COOL_LINKS_CHANNEL_ID').required().asString(),
   },
   redis: {

src/core/deleteExistingCommands.ts

@@ -1,20 +1,17 @@
 import { REST, Routes } from 'discord.js';
 
-import { config } from '../config';
-
 export const deleteExistingCommands = async (
   rest: REST,
-  discord: typeof config.discord,
+  clientId: string,
+  guildId: string,
 ): Promise<void> => {
-  const guildCommands = (await rest.get(
-    Routes.applicationGuildCommands(discord.clientId, discord.guildId),
-  )) as { id: string }[];
+  const guildCommands = (await rest.get(Routes.applicationGuildCommands(clientId, guildId))) as {
+    id: string;
+  }[];
 
   await guildCommands.reduce<Promise<void>>(async (promise, guildCommand) => {
     await promise;
 
-    await rest.delete(
-      Routes.applicationGuildCommand(discord.clientId, discord.guildId, guildCommand.id),
-    );
+    await rest.delete(Routes.applicationGuildCommand(clientId, guildId, guildCommand.id));
   }, Promise.resolve());
 };

src/core/loadModules.ts

@@ -12,7 +12,18 @@ export const loadModules = async (
   const botCommands = Object.values(modulesToLoad).flatMap((module) => module.slashCommands ?? []);
   checkUniqueSlashCommandNames(botCommands);
   routeCommands(client, botCommands);
-  await pushCommands(botCommands.map((command) => command.schema));
 
+  const clientId = client.application?.id;
+  if (!clientId) throw new Error('Client id is not defined');
+
+  const { guilds } = client;
+
+  for (const guild of guilds.cache.values()) {
+    await pushCommands(
+      botCommands.map((command) => command.schema),
+      clientId,
+      guild.id,
+    );
+  }
   routeHandlers(client, modulesToLoad);
 };

src/core/loaderCommands.ts

@@ -11,10 +11,14 @@ import { deleteExistingCommands } from './deleteExistingCommands';
 
 const { discord } = config;
 
-export const pushCommands = async (commands: RESTPostAPIChatInputApplicationCommandsJSONBody[]) => {
+export const pushCommands = async (
+  commands: RESTPostAPIChatInputApplicationCommandsJSONBody[],
+  clientId: string,
+  guildId: string,
+) => {
   const rest = new REST({ version: '10' }).setToken(discord.token);
-  await deleteExistingCommands(rest, discord);
-  await rest.put(Routes.applicationGuildCommands(discord.clientId, discord.guildId), {
+  await deleteExistingCommands(rest, clientId, guildId);
+  await rest.put(Routes.applicationGuildCommands(clientId, guildId), {
     body: commands,
   });
 };

src/main.ts

@@ -8,7 +8,7 @@ import { modules } from './modules/modules';
 const { discord } = config;
 
 const client = new Client({
-  intents: getIntentsFromModules(modules),
+  intents: ['Guilds', ...getIntentsFromModules(modules)],
 });
 
 await client.login(discord.token);