tidy

matrix-org · Jan 20, 2025 · aa86940 · aa86940
1 parent 4274650
commit aa86940
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/Mjolnir.ts b/src/Mjolnir.ts
@@ -220,9 +220,11 @@ export class Mjolnir {
 
         matrixEmitter.on("room.message", async (roomId, event) => {
             const eventContent = event.content;
+            const eventId = event.event_id;
+            const sender = event.sender;
             if (typeof eventContent !== "object") return;
 
-            const { msgtype, body: originalBody, sender, event_id } = eventContent;
+            const { msgtype, body: originalBody } = eventContent;
 
             if (msgtype !== "m.text" || typeof originalBody !== "string") {
                 return;
@@ -236,9 +238,7 @@ export class Mjolnir {
                         return;
                     }
                     this.lastBotMentionForRoomId.set(roomId, true);
-                    const permalink = Permalinks.forEvent(roomId, event_id, [
-                        new UserID(this.clientUserId).domain,
-                    ]);
+                    const permalink = Permalinks.forEvent(roomId, eventId, [new UserID(this.clientUserId).domain]);
                     await this.managementRoomOutput.logMessage(
                         LogLevel.INFO,
                         "Mjolnir",
@@ -280,7 +280,7 @@ export class Mjolnir {
             eventContent.body = COMMAND_PREFIX + restOfBody;
             LogService.info("Mjolnir", `Command being run by ${sender}: ${eventContent.body}`);
 
-            client.sendReadReceipt(roomId, event_id).catch((e: any) => {
+            client.sendReadReceipt(roomId, eventId).catch((e: any) => {
                 LogService.warn("Mjolnir", "Error sending read receipt: ", e);
             });
             return handleCommand(roomId, event, this);

diff --git a/test/integration/commands/commandHandlerTest.ts b/test/integration/commands/commandHandlerTest.ts
@@ -17,24 +17,30 @@ describe("Test: General command handling test", function () {
             visibility: "public",
         });
         await this.moderator.sendText(this.mjolnir.managementRoomId, `!mjolnir rooms add ${publicRoomId}`);
-        const joinPromise = new Promise<void>((resolve) => this.userA.on("room.event", (roomId, evt) => {
-            if (roomId === publicRoomId && evt.type === "m.room.member" && evt.state_key === mjolnirUserId && evt.content.membership === "join") {
-                resolve();
-            }
-        }));
+        const joinPromise = new Promise<void>((resolve) =>
+            this.userA.on("room.event", (roomId, evt) => {
+                if (
+                    roomId === publicRoomId &&
+                    evt.type === "m.room.member" &&
+                    evt.state_key === mjolnirUserId &&
+                    evt.content.membership === "join"
+                ) {
+                    resolve();
+                }
+            }),
+        );
         await this.userA.inviteUser(mjolnirUserId, publicRoomId);
         await joinPromise;
         await this.userA.sendText(publicRoomId, "!mjolnir enable MentionSpam");
 
-        const reply = new Promise<null|unknown>(
-            (resolve, reject) => {
-                // Mjolnir should ignore our message entirely.
-                setTimeout(() => resolve(null), 10000);
-                getFirstReply(this.userA, publicRoomId, () => this.userA.sendText(publicRoomId, "!mjolnir status")).then(resolve).catch(reject);
-            }
-        );
-        
+        const reply = new Promise<null | unknown>((resolve, reject) => {
+            // Mjolnir should ignore our message entirely.
+            setTimeout(() => resolve(null), 10000);
+            getFirstReply(this.userA, publicRoomId, () => this.userA.sendText(publicRoomId, "!mjolnir status"))
+                .then(resolve)
+                .catch(reject);
+        });
+
         expect(await reply).toBeNull();
     });
-
 });