fix: remove cache entries on delete channel (#62)

Author: luca-montaigut

src/modules/quoiFeur/quoiFeur.helpers.ts

@@ -1,4 +1,10 @@
-import { ChannelType, type ChatInputCommandInteraction, type Message } from 'discord.js';
+import {
+  ChannelType,
+  type ChatInputCommandInteraction,
+  DMChannel,
+  type Message,
+  type NonThreadGuildBasedChannel,
+} from 'discord.js';
 
 import { cache } from '../../core/cache';
 import { removeEmoji, removePunctuation } from '../../helpers/regex.helper';
@@ -70,3 +76,16 @@ export const removeQuoiFeurFromChannel = async (interaction: ChatInputCommandInt
   );
   await interaction.reply('Quoi-feur disabled in this channel');
 };
+
+export const cleanCacheOnChannelDelete = async (
+  channel: DMChannel | NonThreadGuildBasedChannel,
+) => {
+  const { id } = channel;
+  const channels = await cache.get('quoiFeurChannels', []);
+  if (!channels.includes(id)) return;
+
+  await cache.set(
+    'quoiFeurChannels',
+    channels.filter((channelId) => channelId !== id),
+  );
+};

src/modules/quoiFeur/quoiFeur.module.ts

@@ -3,6 +3,7 @@ import { SlashCommandBuilder } from 'discord.js';
 import type { BotModule } from '../../types/bot';
 import {
   addQuoiFeurToChannel,
+  cleanCacheOnChannelDelete,
   reactOnEndWithQuoi,
   removeQuoiFeurFromChannel,
 } from './quoiFeur.helpers';
@@ -28,6 +29,7 @@ export const quoiFeur: BotModule = {
   ],
   eventHandlers: {
     messageCreate: reactOnEndWithQuoi,
+    channelDelete: cleanCacheOnChannelDelete,
   },
   intents: ['Guilds', 'GuildMessages', 'MessageContent', 'GuildMessageReactions'],
 };

src/modules/recurringMessage/recurringMessage.helpers.ts

@@ -1,6 +1,11 @@
 import { CronJob } from 'cron';
 import { randomUUID } from 'crypto';
-import type { ChatInputCommandInteraction, Client } from 'discord.js';
+import type {
+  ChatInputCommandInteraction,
+  Client,
+  DMChannel,
+  NonThreadGuildBasedChannel,
+} from 'discord.js';
 
 import { cache } from '../../core/cache';
 import { isModo } from '../../helpers/roles';
@@ -134,9 +139,37 @@ export const listRecurringMessages = async (interaction: ChatInputCommandInterac
 export const relaunchRecurringMessages = async (client: Client<true>) => {
   const recurringMessages = await cache.get('recurringMessages', []);
 
-  recurringMessages.forEach(({ id, channelId, frequency, message }) => {
+  const channelsToClear = new Set<string>();
+  for (const { id, channelId, frequency, message } of recurringMessages) {
+    if (!client.channels.cache.get(channelId)) {
+      channelsToClear.add(channelId);
+      continue;
+    }
     const job = createRecurringMessage(client, channelId, frequency, message);
     job.start();
     inMemoryJobList.push({ id, job });
-  });
+  }
+
+  await cache.set(
+    'recurringMessages',
+    recurringMessages.filter(({ channelId }) => !channelsToClear.has(channelId)),
+  );
+};
+
+export const removeAllFromChannel = async (channel: DMChannel | NonThreadGuildBasedChannel) => {
+  const { id } = channel;
+
+  const recurringMessages = await cache.get('recurringMessages', []);
+  const jobsToRemove = recurringMessages.filter(({ channelId }) => id === channelId);
+
+  await cache.set(
+    'recurringMessages',
+    recurringMessages.filter(({ channelId }) => id !== channelId),
+  );
+
+  for (const { id } of jobsToRemove) {
+    const job = inMemoryJobList.find(({ id: jobId }) => id === jobId)?.job;
+    if (!job) continue;
+    job.stop();
+  }
 };

src/modules/recurringMessage/recurringMessage.module.ts

@@ -6,6 +6,7 @@ import {
   hasPermission,
   listRecurringMessages,
   relaunchRecurringMessages,
+  removeAllFromChannel,
   removeRecurringMessage,
 } from './recurringMessage.helpers';
 
@@ -69,8 +70,8 @@ export const recurringMessage: BotModule = {
     },
   ],
   eventHandlers: {
-    // relaunch recurring messages on bot restart
     ready: relaunchRecurringMessages,
+    channelDelete: removeAllFromChannel,
   },
   intents: ['Guilds'],
 };