From ae7ba55b999fb5d0b6fb0ca517b5d385b9f038b1 Mon Sep 17 00:00:00 2001
From: mctaylors <cantsendmails@mctaylors.ru>
Date: Thu, 21 Dec 2023 18:51:33 +0300
Subject: [PATCH] Don't send leave message if user was kicked/banned

Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
---
 locale/Messages.resx                       |  2 +-
 src/Responders/GuildMemberLeftResponder.cs | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/locale/Messages.resx b/locale/Messages.resx
index 0bcd089..e49a3e3 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -584,7 +584,7 @@
   </data>
   <data name="ButtonReportIssue" xml:space="preserve">
       <value>Report an issue</value>
-  </data
+  </data>
   <data name="DefaultLeaveMessage" xml:space="preserve">
       <value>See you soon, {0}!</value>
   </data>
diff --git a/src/Responders/GuildMemberLeftResponder.cs b/src/Responders/GuildMemberLeftResponder.cs
index 92f2c49..4434fec 100644
--- a/src/Responders/GuildMemberLeftResponder.cs
+++ b/src/Responders/GuildMemberLeftResponder.cs
@@ -35,6 +35,17 @@ public class GuildMemberLeftResponder : IResponder<IGuildMemberRemove>
         var data = await _guildData.GetData(gatewayEvent.GuildID, ct);
         var cfg = data.Settings;
 
+        var memberData = data.GetOrCreateMemberData(user.ID);
+        if (memberData.BannedUntil is not null)
+        {
+            return Result.FromSuccess();
+        }
+
+        if (memberData.Kicked)
+        {
+            return Result.FromSuccess();
+        }
+
         if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty()
             || GuildSettings.LeaveMessage.Get(cfg) is "off" or "disable" or "disabled")
         {