fix: fixed deletion of old messages function

src/scripts/tasks/deleteExpiredInvites.ts

@@ -1,7 +1,6 @@
 import db from '../../utils/Db.js';
 
-const deleteExpiredInvites = async () => {
+export default async () => {
   const olderThan1h = new Date(Date.now() - 60 * 60 * 1_000);
   await db.hubInvites.deleteMany({ where: { expires: { lte: olderThan1h } } }).catch(() => null);
 };
-export default deleteExpiredInvites;

src/scripts/tasks/deleteOldMessages.ts

@@ -1,15 +1,15 @@
-import { captureException } from '@sentry/node';
 import db from '../../utils/Db.js';
-import { deleteMsgsFromDb } from '../../utils/Utils.js';
 
 // Delete all network messages from db that are older than 24 hours old.
-const deleteOldMessages = async () => {
+export default async () => {
   const olderThan24h = Date.now() - 60 * 60 * 24_000;
 
-  db.broadcastedMessages
-    .findMany({ where: { createdAt: { lte: olderThan24h } } })
-    .then(async (m) => deleteMsgsFromDb(m.map(({ messageId }) => messageId)))
-    .catch(captureException);
-};
+  const data = await db.broadcastedMessages.findMany({
+    where: { createdAt: { lte: olderThan24h } },
+  });
+  await db.broadcastedMessages.deleteMany({ where: { createdAt: { lte: olderThan24h } } });
 
-export default deleteOldMessages;
+  await db.originalMessages.deleteMany({
+    where: { messageId: { in: data.map((d) => d.originalMsgId) } },
+  });
+};

src/scripts/tasks/syncBotlistStats.ts

@@ -2,8 +2,7 @@ import Logger from '../../utils/Logger.js';
 import { updateTopGGStats } from '../../updater/StatsUpdater.js';
 import { ClusterManager } from 'discord-hybrid-sharding';
 
-// other jobs
-const syncBotlistStats = async (manager: ClusterManager) => {
+export default async (manager: ClusterManager) => {
   const count = (await manager.fetchClientValues('guilds.cache.size')) as number[];
   Logger.info(
     `Updated top.gg stats with ${count.reduce((p, n) => p + n, 0)} guilds and ${
@@ -16,5 +15,3 @@ const syncBotlistStats = async (manager: ClusterManager) => {
     manager.totalShards,
   );
 };
-
-export default syncBotlistStats;

src/scripts/tasks/updateBlacklists.ts

@@ -2,10 +2,7 @@ import { blacklistedServers, userData } from '@prisma/client';
 import BlacklistManager from '../../managers/BlacklistManager.js';
 import Scheduler from '../../services/SchedulerService.js';
 
-const updateBlacklists = async (
-  blacklists: (blacklistedServers | userData)[],
-  scheduler: Scheduler,
-) => {
+export default async (blacklists: (blacklistedServers | userData)[], scheduler: Scheduler) => {
   if (blacklists.length === 0) return;
 
   const blacklistManager = new BlacklistManager(scheduler);
@@ -33,5 +30,3 @@ const updateBlacklists = async (
     }
   }
 };
-
-export default updateBlacklists;

src/utils/Utils.ts

@@ -22,7 +22,16 @@ import {
   TextChannel,
   ThreadChannel,
 } from 'discord.js';
-import { DeveloperIds, REGEX, StaffIds, SupporterIds, LINKS, colors, emojis, SUPPORT_SERVER_ID } from './Constants.js';
+import {
+  DeveloperIds,
+  REGEX,
+  StaffIds,
+  SupporterIds,
+  LINKS,
+  colors,
+  emojis,
+  SUPPORT_SERVER_ID,
+} from './Constants.js';
 import { randomBytes } from 'crypto';
 import { t } from './Locale.js';
 import 'dotenv/config';
@@ -386,13 +395,16 @@ export const modifyUserRole = async (
   guildId: Snowflake,
   roleId: Snowflake,
 ) => {
-  await cluster.broadcastEval(async (client, ctx) => {
-    const guild = client.guilds.cache.get(ctx.guildId);
-    const voterRole = guild?.roles.cache.find(({ id }) => id === ctx.roleId);
-    const member = await guild?.members.fetch(ctx.userId).catch(() => null);
-    if (!guild || !voterRole) return;
-
-    // add or remove role
-    await member?.roles[ctx.action](voterRole).catch(() => null);
-  }, { guildId: SUPPORT_SERVER_ID, context: { userId, roleId, guildId, action } });
-};
+  await cluster.broadcastEval(
+    async (client, ctx) => {
+      const guild = client.guilds.cache.get(ctx.guildId);
+      const voterRole = guild?.roles.cache.find(({ id }) => id === ctx.roleId);
+      const member = await guild?.members.fetch(ctx.userId).catch(() => null);
+      if (!guild || !voterRole) return;
+
+      // add or remove role
+      await member?.roles[ctx.action](voterRole).catch(() => null);
+    },
+    { guildId: SUPPORT_SERVER_ID, context: { userId, roleId, guildId, action } },
+  );
+};