Do not interrupt redact sequences because of exceptions on backfilling (

#479)
matrix-org · Jul 24, 2024 · 1ffde55 · 1ffde55
1 parent e776d82
commit 1ffde55
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -86,16 +86,20 @@ export async function redactUserMessagesIn(client: MatrixSendClient, managementR
     for (const targetRoomId of targetRoomIds) {
         await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Fetching sent messages for ${userIdOrGlob} in ${targetRoomId} to redact...`, targetRoomId);
 
-        await getMessagesByUserIn(client, userIdOrGlob, targetRoomId, limit, async (eventsToRedact) => {
-            for (const targetEvent of eventsToRedact) {
-                await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Redacting ${targetEvent['event_id']} in ${targetRoomId}`, targetRoomId);
-                if (!noop) {
-                    await client.redactEvent(targetRoomId, targetEvent['event_id']);
-                } else {
-                    await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${targetEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
+        try {
+            await getMessagesByUserIn(client, userIdOrGlob, targetRoomId, limit, async (eventsToRedact) => {
+                for (const targetEvent of eventsToRedact) {
+                    await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Redacting ${targetEvent['event_id']} in ${targetRoomId}`, targetRoomId);
+                    if (!noop) {
+                        await client.redactEvent(targetRoomId, targetEvent['event_id']);
+                    } else {
+                        await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${targetEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
+                    }
                 }
-            }
-        });
+            });
+        } catch (error) {
+            await managementRoom.logMessage(LogLevel.ERROR, "utils#redactUserMessagesIn", `Caught an error while trying to redact messages for ${userIdOrGlob} in ${targetRoomId}: ${error}`, targetRoomId);
+        }
     }
 }