Fix incorrect "kicked" modlog when users leave (#247)

The logic here was checking whether a return value existed, but I got
things twisted as I refactored and had added a "left" case. So members
that leave the server are being incorrectly logged as kicked.

Strictly speaking, we could in fact open a new thread for every member,
thus capturing their entire membership journey — when they join, when
the leave (or are removed), any automod triggers… The downside is that
it becomes a little bit more "proactive surveillance" vs "incident
recording", and in general I prefer to avoid surveillance

Author: vcarl

app/discord/modActionLogger.ts

@@ -27,66 +27,37 @@ async function handleBanAdd(ban: GuildBan) {
     reason,
   });
 
-  try {
-    // Check audit log for who performed the ban
-    const auditLogs = await guild.fetchAuditLogs({
-      type: AuditLogEvent.MemberBanAdd,
-      limit: 5,
-    });
-
-    const banEntry = auditLogs.entries.find(
-      (entry) =>
-        entry.target?.id === user.id &&
-        Date.now() - entry.createdTimestamp < AUDIT_LOG_WINDOW_MS,
-    );
+  // Check audit log for who performed the ban
+  const auditLogs = await guild.fetchAuditLogs({
+    type: AuditLogEvent.MemberBanAdd,
+    limit: 5,
+  });
 
-    executor = banEntry?.executor ?? null;
-    reason = banEntry?.reason ?? reason;
+  const banEntry = auditLogs.entries.find(
+    (entry) =>
+      entry.target?.id === user.id &&
+      Date.now() - entry.createdTimestamp < AUDIT_LOG_WINDOW_MS,
+  );
 
-    // Skip if the bot performed this action (it's already logged elsewhere)
-    if (executor?.id === guild.client.user?.id) {
-      log("debug", "ModActionLogger", "Skipping self-ban", {
-        userId: user.id,
-        guildId: guild.id,
-      });
-      return;
-    }
-  } catch (error) {
-    // If we can't access audit log, still log the ban but without executor info
-    if (
-      error instanceof Error &&
-      error.message.includes("Missing Permissions")
-    ) {
-      log(
-        "warn",
-        "ModActionLogger",
-        "Cannot access audit log for ban details",
-        { userId: user.id, guildId: guild.id },
-      );
-    } else {
-      log("error", "ModActionLogger", "Failed to fetch audit log for ban", {
-        userId: user.id,
-        guildId: guild.id,
-        error,
-      });
-    }
-  }
+  executor = banEntry?.executor ?? null;
+  reason = banEntry?.reason ?? reason;
 
-  try {
-    await reportModAction({
-      guild,
-      user,
-      actionType: "ban",
-      executor,
-      reason: reason ?? "",
-    });
-  } catch (error) {
-    log("error", "ModActionLogger", "Failed to report ban", {
+  // Skip if the bot performed this action (it's already logged elsewhere)
+  if (executor?.id === guild.client.user?.id) {
+    log("debug", "ModActionLogger", "Skipping self-ban", {
       userId: user.id,
       guildId: guild.id,
-      error,
     });
+    return;
   }
+
+  await reportModAction({
+    guild,
+    user,
+    actionType: "ban",
+    executor,
+    reason: reason ?? "",
+  });
 }
 
 async function fetchAuditLogs(
@@ -152,41 +123,39 @@ async function handleMemberRemove(member: GuildMember | PartialGuildMember) {
     guildId: guild.id,
   });
 
-  try {
-    const auditLogs = await fetchAuditLogs(guild, user);
-
-    if (auditLogs) {
-      const { executor = null, reason = "" } = auditLogs;
-      await reportModAction({
-        guild,
-        user,
-        actionType: "kick",
-        executor,
-        reason,
-      });
-      return;
-    }
-    await reportModAction({
-      guild,
-      user,
-      actionType: "left",
-      executor: undefined,
-      reason: undefined,
-    });
-  } catch (error) {
-    log("error", "ModActionLogger", "Failed to handle member removal", {
-      userId: user.id,
-      guildId: guild.id,
-      error,
-    });
+  const auditLogs = await fetchAuditLogs(guild, user);
+  if (!auditLogs || auditLogs?.actionType === "left") {
+    return;
   }
+
+  const { executor = null, reason = "" } = auditLogs;
+  await reportModAction({
+    guild,
+    user,
+    actionType: "kick",
+    executor,
+    reason,
+  });
 }
 
 export default async (bot: Client) => {
   bot.on(Events.GuildBanAdd, async (ban) => {
     try {
       await handleBanAdd(ban);
     } catch (error) {
+      // If we can't access audit log, still log the ban but without executor info
+      if (
+        error instanceof Error &&
+        error.message.includes("Missing Permissions")
+      ) {
+        log(
+          "warn",
+          "ModActionLogger",
+          "Cannot access audit log for ban details",
+          { userId: ban.user.id, guildId: ban.guild.id },
+        );
+        return;
+      }
       log("error", "ModActionLogger", "Unhandled error in ban handler", {
         userId: ban.user.id,
         guildId: ban.guild.id,
@@ -203,11 +172,7 @@ export default async (bot: Client) => {
         "error",
         "ModActionLogger",
         "Unhandled error in member remove handler",
-        {
-          userId: member.user?.id,
-          guildId: member.guild.id,
-          error,
-        },
+        { userId: member.user?.id, guildId: member.guild.id, error },
       );
     }
   });