From 0f9c67a1c1a8040b132a2b919abf85925d334631 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Wed, 23 Dec 2020 06:00:45 +0200
Subject: [PATCH] Fix members leaving being logged as kicks

---
 .../events/CreateKickCaseOnManualKickEvt.ts        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts
index b461f3aa..a88ba02d 100644
--- a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts
+++ b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts
@@ -31,6 +31,8 @@ export const CreateKickCaseOnManualKickEvt = modActionsEvt(
     let mod: User | UnknownUser | null = null;
     let createdCase: Case | null = null;
 
+    // Since a member leaving and a member being kicked are both the same gateway event,
+    // we can only really interpret this event as a kick if there is a matching audit log entry.
     if (kickAuditLogEntry) {
       createdCase = (await pluginData.state.cases.findByAuditLogId(kickAuditLogEntry.id)) || null;
       if (createdCase) {
@@ -54,12 +56,12 @@ export const CreateKickCaseOnManualKickEvt = modActionsEvt(
           });
         }
       }
-    }
 
-    pluginData.state.serverLogs.log(LogType.MEMBER_KICK, {
-      user: stripObjectToScalars(member.user),
-      mod: mod ? stripObjectToScalars(mod) : null,
-      caseNumber: createdCase?.case_number ?? 0,
-    });
+      pluginData.state.serverLogs.log(LogType.MEMBER_KICK, {
+        user: stripObjectToScalars(member.user),
+        mod: mod ? stripObjectToScalars(mod) : null,
+        caseNumber: createdCase?.case_number ?? 0,
+      });
+    }
   },
 );