From b893d41d637bdd989a97f1cf0daa71c417250924 Mon Sep 17 00:00:00 2001
From: Marco Cirillo <marco.cirillo@aria-net.org>
Date: Tue, 2 May 2023 19:34:38 +0200
Subject: [PATCH 1/3] Do not interrupt redact sequences due to error when
 backfilling

... Mainly timeouts.
---
 src/utils.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index c3c59919..d0a63991 100644
--- 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 victimEvent of eventsToRedact) {
-                await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Redacting ${victimEvent['event_id']} in ${targetRoomId}`, targetRoomId);
-                if (!noop) {
-                    await client.redactEvent(targetRoomId, victimEvent['event_id']);
-                } else {
-                    await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${victimEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
+        try {
+            await getMessagesByUserIn(client, userIdOrGlob, targetRoomId, limit, async (eventsToRedact) => {
+                for (const victimEvent of eventsToRedact) {
+                    await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Redacting ${victimEvent['event_id']} in ${targetRoomId}`, targetRoomId);
+                    if (!noop) {
+                        await client.redactEvent(targetRoomId, victimEvent['event_id']);
+                    } else {
+                        await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${victimEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
+                    }
                 }
-            }
-        });
+            });
+        } catch (error) {
+            await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Caught an error while trying to redact messages for ${userIdOrGlob} in ${targetRoomId}: ${error}`, targetRoomId);
+        }
     }
 }
 

From 6fc00b25684e724f18781fd43f519dd85c69dbe2 Mon Sep 17 00:00:00 2001
From: Marco Cirillo <marco.cirillo@aria-net.org>
Date: Wed, 3 May 2023 18:22:39 +0200
Subject: [PATCH 2/3] Change log level from Debug to Error

---
 src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index d0a63991..fd04952e 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -98,7 +98,7 @@ export async function redactUserMessagesIn(client: MatrixSendClient, managementR
                 }
             });
         } catch (error) {
-            await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Caught an error while trying to redact messages for ${userIdOrGlob} in ${targetRoomId}: ${error}`, targetRoomId);
+            await managementRoom.logMessage(LogLevel.ERROR, "utils#redactUserMessagesIn", `Caught an error while trying to redact messages for ${userIdOrGlob} in ${targetRoomId}: ${error}`, targetRoomId);
         }
     }
 }

From 9b2d21bde48fbe6febe1c8bb54c7a88acd4a3465 Mon Sep 17 00:00:00 2001
From: Shay <hillerys@element.io>
Date: Wed, 24 Jul 2024 15:51:25 -0700
Subject: [PATCH 3/3] use modern language

---
 src/utils.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index fd04952e..40f32445 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -88,12 +88,12 @@ export async function redactUserMessagesIn(client: MatrixSendClient, managementR
 
         try {
             await getMessagesByUserIn(client, userIdOrGlob, targetRoomId, limit, async (eventsToRedact) => {
-                for (const victimEvent of eventsToRedact) {
-                    await managementRoom.logMessage(LogLevel.DEBUG, "utils#redactUserMessagesIn", `Redacting ${victimEvent['event_id']} in ${targetRoomId}`, targetRoomId);
+                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, victimEvent['event_id']);
+                        await client.redactEvent(targetRoomId, targetEvent['event_id']);
                     } else {
-                        await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${victimEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
+                        await managementRoom.logMessage(LogLevel.WARN, "utils#redactUserMessagesIn", `Tried to redact ${targetEvent['event_id']} in ${targetRoomId} but Mjolnir is running in no-op mode`, targetRoomId);
                     }
                 }
             });