fix: pr returns adjustement

codinglab-io · Sep 4, 2023 · 10c037d · 10c037d
1 parent d9cb95a
commit 10c037d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/src/helpers/regex.helper.ts b/src/helpers/regex.helper.ts
@@ -3,13 +3,10 @@ const socialNetworksUrlRegex = new RegExp(
 );
 const punctuationRegex = new RegExp(/[.,!?]/g);
 const emojiRegex = new RegExp(/(\p{Extended_Pictographic}|\p{Emoji_Component})/gu);
-const quoiDetectorRegex = new RegExp(/\b\s*[q][u][o][i]\s*$/i);
 
 export const isASocialNetworkUrl = (url: string): boolean => {
   return socialNetworksUrlRegex.test(url);
 };
 
 export const removePunctuation = (text: string) => text.replaceAll(punctuationRegex, '');
 export const removeEmoji = (text: string) => text.replaceAll(emojiRegex, '');
-export const endWithQuoi = (text: string) =>
-  quoiDetectorRegex.test(removeEmoji(removePunctuation(text)));
diff --git a/src/modules/quoiFeur/quoiFeur.helpers.ts b/src/modules/quoiFeur/quoiFeur.helpers.ts
@@ -1,17 +1,21 @@
 import {
   ChannelType,
   type ChatInputCommandInteraction,
+  Client,
   Guild,
   type Message,
   Role,
 } from 'discord.js';
 
 import { cache } from '../../core/cache';
-import { endWithQuoi } from '../../helpers/regex.helper';
+import { removeEmoji, removePunctuation } from '../../helpers/regex.helper';
 
 const ONE_MINUTE = 1 * 60 * 1000;
 const MUTED_BY_BOT = 'Muted by bot';
 
+const quoiDetectorRegex = /\bquoi\s*$/i;
+const endWithQuoi = (text: string) => quoiDetectorRegex.test(removeEmoji(removePunctuation(text)));
+
 const reactWithFeur = async (message: Message) => {
   await message.react('🇫');
   await message.react('🇪');
@@ -69,14 +73,15 @@ export const createRoleMutedByBot = async (guild: Guild | null): Promise<Role> =
   );
 };
 
-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);
+export const deleteRoleMutedByBot = async (client: Client<true>): Promise<void> => {
+  const guilds = await client.guilds.fetch().then((guilds) => guilds.map((guild) => guild.fetch()));
+  const roles = await Promise.all(guilds).then((guilds) =>
+    guilds.map((guild) => guild.roles.cache.find((role) => role.name === MUTED_BY_BOT)),
+  );
 
-  if (existingMutedByBot) {
-    await existingMutedByBot.delete();
+  for (const role of roles) {
+    if (!role) continue;
+    await role.delete();
   }
 };
 

diff --git a/src/modules/quoiFeur/quoiFeur.module.ts b/src/modules/quoiFeur/quoiFeur.module.ts
@@ -1,6 +1,5 @@
 import { SlashCommandBuilder } from 'discord.js';
 
-import { config } from '../../config';
 import type { BotModule } from '../../types/bot';
 import {
   addQuoiFeurToChannel,
@@ -23,23 +22,14 @@ export const quoiFeur: BotModule = {
         )
         .toJSON(),
       handler: {
-        add: async (interaction) => {
-          await addQuoiFeurToChannel(interaction).catch(console.error);
-        },
-        remove: async (interaction) => {
-          await removeQuoiFeurFromChannel(interaction).catch(console.error);
-        },
+        add: addQuoiFeurToChannel,
+        remove: removeQuoiFeurFromChannel,
       },
     },
   ],
   eventHandlers: {
-    ready: async (client) => {
-      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 reactOnEndWithQuoi(message).catch(console.error);
-    },
+    // unmute everyone in every server on bot restart
+    ready: deleteRoleMutedByBot,
+    messageCreate: reactOnEndWithQuoi,
   },
 };