fix(msgs): fix old messages not getting deleted

Discord-InterChat · Jan 13, 2024 · ec99483 · ec99483
1 parent c6e202f
commit ec99483
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -134,6 +134,7 @@ model originalMessages {
 model broadcastedMessages {
   messageId     String           @id @map("_id")
   channelId     String
+  createdAt     Int
   originalMsg   originalMessages @relation(fields: [originalMsgId], references: [messageId])
   originalMsgId String           @db.String
 }

diff --git a/src/index.ts b/src/index.ts
@@ -43,14 +43,10 @@ const deleteExpiredInvites = async () => {
 // Delete all network messages from db that are older than 24 hours old.
 const deleteOldMessages = async () => {
   const olderThan24h = Date.now() - 60 * 60 * 24_000;
-  // the big number is Discord's epoch. ie. the first second of year 2015
-  const snowflakeFor24hAgo = (olderThan24h - 1420070400000) << 22;
 
   db.broadcastedMessages
-    .findMany({ where: { messageId: { lte: `${snowflakeFor24hAgo}` } } })
-    .then(async (m) => {
-      await deleteMsgsFromDb(m.map(({ messageId }) => messageId));
-    })
+    .findMany({ where: { createdAt: { lte: olderThan24h } } })
+    .then(async (m) => deleteMsgsFromDb(m.map(({ messageId }) => messageId)))
     .catch(captureException);
 };
 

diff --git a/src/managers/NetworkManager.ts b/src/managers/NetworkManager.ts
@@ -17,7 +17,7 @@ import { Prisma, connectedList, hubs, originalMessages } from '@prisma/client';
 import { LINKS, REGEX, emojis } from '../utils/Constants.js';
 import { check as checkProfanity, censor } from '../utils/Profanity.js';
 import { HubSettingsBitField } from '../utils/BitFields.js';
-import { replaceLinks } from '../utils/Utils.js';
+import { parseTimestampFromId, replaceLinks } from '../utils/Utils.js';
 import HubLogsManager from './HubLogsManager.js';
 import { t } from '../utils/Locale.js';
 
@@ -545,7 +545,7 @@ export default class NetworkManager extends Factory {
     hubId: string,
     dbReference?: originalMessages | null,
   ): Promise<void> {
-    const messageDataObj: { channelId: string; messageId: string }[] = [];
+    const messageDataObj: { channelId: string; messageId: string, createdAt: number }[] = [];
     const invalidWebhookURLs: string[] = [];
 
     // loop through all results and extract message data and invalid webhook urls
@@ -573,6 +573,7 @@ export default class NetworkManager extends Factory {
         messageDataObj.push({
           channelId: result.messageOrError.channelId,
           messageId: result.messageOrError.id,
+          createdAt: parseTimestampFromId(result.messageOrError.id),
         });
       }
     });