refactor: match new architecture

Author: luca-montaigut

src/constants/roles.ts

@@ -1,11 +1,13 @@
 import { coolLinksManagement } from './coolLinksManagement/coolLinksManagement.module';
 import { fart } from './fart/fart.module';
 import { patternReplace } from './patternReplace/patternReplace.module';
+import { quoiFeur } from './quoiFeur/quoiFeur.module';
 import { voiceOnDemand } from './voiceOnDemand/voiceOnDemand.module';
 
 export const modules = {
   fart,
   voiceOnDemand,
   coolLinksManagement,
   patternReplace,
+  quoiFeur,
 };

src/modules/modules.ts

@@ -1,10 +1,16 @@
-import { type ChatInputCommandInteraction, type Message, TextChannel } from 'discord.js';
+import {
+  ChannelType,
+  type ChatInputCommandInteraction,
+  Guild,
+  type Message,
+  Role,
+} from 'discord.js';
 
-import { MUTED_BY_BOT } from '../../constants/roles';
 import { cache } from '../../core/cache';
 import { endWithQuoi } from '../../helpers/regex.helper';
 
 const ONE_MINUTE = 1 * 60 * 1000;
+const MUTED_BY_BOT = 'Muted by bot';
 
 const reactWithFeur = async (message: Message) => {
   await message.react('🇫');
@@ -33,7 +39,7 @@ const reactWithCoubeh = async (message: Message) => {
   }, ONE_MINUTE * 5);
 };
 
-export const quoiFeurReact = async (message: Message) => {
+export const reactOnEndWithQuoi = async (message: Message) => {
   const channelIds = await cache.get('quoiFeurChannels', []);
   const channelHasGame = channelIds.find((channelId) => channelId === message.channelId);
   if (!channelHasGame) return;
@@ -49,22 +55,42 @@ export const quoiFeurReact = async (message: Message) => {
   }
 };
 
-export const addQuoiFeurChannel = async (interaction: ChatInputCommandInteraction) => {
+export const createRoleMutedByBot = async (guild: Guild | null): Promise<Role> => {
+  if (!guild) {
+    throw new Error('Guild is null in createRoleMutedByBot');
+  }
+  const existingMutedByBot = guild.roles.cache.find((role) => role.name === MUTED_BY_BOT);
+
+  return (
+    existingMutedByBot ??
+    guild.roles.create({
+      name: MUTED_BY_BOT,
+    })
+  );
+};
+
+export const deleteRoleMutedByBot = async (guild: Guild | null): Promise<void> => {
+  if (!guild) {
+    throw new Error('Guild is null in removeRoleMutedByBot');
+  }
+  const existingMutedByBot = guild.roles.cache.find((role) => role.name === MUTED_BY_BOT);
+
+  if (existingMutedByBot) {
+    await existingMutedByBot.delete();
+  }
+};
+
+export const addQuoiFeurToChannel = async (interaction: ChatInputCommandInteraction) => {
   const channel = interaction.channel;
-  if (!channel || !channel.isTextBased()) return;
+  if (!channel || !channel.isTextBased() || channel.type !== ChannelType.GuildText) return;
 
   const channels = await cache.get('quoiFeurChannels', []);
   if (channels.includes(channel.id)) {
     await interaction.reply('Quoi-feur is already enabled in this channel');
     return;
   }
 
-  const role = interaction.guild?.roles.cache.find((r) => r.name === MUTED_BY_BOT);
-  if (!role) {
-    throw new Error(`Role ${MUTED_BY_BOT} is missing`);
-  }
-
-  if (!(channel instanceof TextChannel)) return;
+  const role = await createRoleMutedByBot(interaction.guild);
   await channel.permissionOverwrites.create(role, {
     SendMessages: false,
     CreatePublicThreads: false,
@@ -77,9 +103,9 @@ export const addQuoiFeurChannel = async (interaction: ChatInputCommandInteractio
   await interaction.reply('Quoi-feur enabled in this channel');
 };
 
-export const removeQuoiFeurChannel = async (interaction: ChatInputCommandInteraction) => {
+export const removeQuoiFeurFromChannel = async (interaction: ChatInputCommandInteraction) => {
   const channel = interaction.channel;
-  if (!channel || !channel.isTextBased()) return;
+  if (!channel || !channel.isTextBased() || channel.type !== ChannelType.GuildText) return;
 
   const channels = await cache.get('quoiFeurChannels', []);
   if (!channels.includes(channel.id)) {
@@ -88,10 +114,9 @@ export const removeQuoiFeurChannel = async (interaction: ChatInputCommandInterac
   }
 
   const role = interaction.guild?.roles.cache.find((r) => r.name === MUTED_BY_BOT);
-  if (!role) return;
-  if (!(channel instanceof TextChannel)) return;
-
-  await channel.permissionOverwrites.delete(role);
+  if (role) {
+    await channel.permissionOverwrites.delete(role);
+  }
   await cache.set(
     'quoiFeurChannels',
     channels.filter((channelId) => channelId !== channel.id),

src/modules/quoiFeur/quoiFeur.helpers.ts

@@ -1,9 +1,13 @@
 import { SlashCommandBuilder } from 'discord.js';
 
 import { config } from '../../config';
-import { MUTED_BY_BOT } from '../../constants/roles';
 import type { BotModule } from '../../types/bot';
-import { addQuoiFeurChannel, quoiFeurReact, removeQuoiFeurChannel } from './quoiFeur.helpers';
+import {
+  addQuoiFeurToChannel,
+  deleteRoleMutedByBot,
+  reactOnEndWithQuoi,
+  removeQuoiFeurFromChannel,
+} from './quoiFeur.helpers';
 
 export const quoiFeur: BotModule = {
   slashCommands: [
@@ -12,36 +16,30 @@ export const quoiFeur: BotModule = {
         .setName('quoi-feur')
         .setDescription('Manage quoi-feur game in the channel')
         .addSubcommand((subcommand) =>
-          subcommand.setName('add').setDescription('Add the quoi-feur game in the channel'),
+          subcommand.setName('add').setDescription('Add the quoi-feur game to the channel'),
         )
         .addSubcommand((subcommand) =>
-          subcommand.setName('remove').setDescription('Remove the quoi-feur game in the channel'),
+          subcommand.setName('remove').setDescription('Remove the quoi-feur game from the channel'),
         )
         .toJSON(),
       handler: {
         add: async (interaction) => {
-          await addQuoiFeurChannel(interaction);
+          await addQuoiFeurToChannel(interaction).catch(console.error);
         },
         remove: async (interaction) => {
-          await removeQuoiFeurChannel(interaction);
+          await removeQuoiFeurFromChannel(interaction).catch(console.error);
         },
       },
     },
   ],
   eventHandlers: {
     ready: async (client) => {
-      const guild = await client.guilds.fetch(config.discord.guildId);
-      const hasMutedByBot = guild.roles.cache.find((role) => role.name === MUTED_BY_BOT);
-      if (hasMutedByBot) {
-        // delete to unmute all members and re-create it
-        await hasMutedByBot.delete();
-      }
-      await guild.roles.create({
-        name: MUTED_BY_BOT,
-      });
+      const guild = client.guilds.cache.get(config.discord.guildId) ?? null;
+      // unmute everyone on bot restart
+      await deleteRoleMutedByBot(guild).catch(console.error);
     },
     messageCreate: async (message) => {
-      await quoiFeurReact(message);
+      await reactOnEndWithQuoi(message).catch(console.error);
     },
   },
 };