From c1ef183710593fead5954f2530a49d821cc19885 Mon Sep 17 00:00:00 2001
From: mctaylors <cantsendmails@mctaylors.ru>
Date: Mon, 18 Mar 2024 15:55:12 +0300
Subject: [PATCH] fucked around and made a workaround

Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
---
 src/Commands/BanCommandGroup.cs  | 8 +++++---
 src/Commands/KickCommandGroup.cs | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Commands/BanCommandGroup.cs b/src/Commands/BanCommandGroup.cs
index c350729..30cff14 100644
--- a/src/Commands/BanCommandGroup.cs
+++ b/src/Commands/BanCommandGroup.cs
@@ -181,17 +181,19 @@ public class BanCommandGroup : CommandGroup
             await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
         }
 
+        var memberData = data.GetOrCreateMemberData(target.ID);
+        memberData.BannedUntil
+            = duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
+
         var banResult = await _guildApi.CreateGuildBanAsync(
             guild.ID, target.ID, reason: $"({executor.GetTag()}) {reason}".EncodeHeader(),
             ct: ct);
         if (!banResult.IsSuccess)
         {
+            memberData.BannedUntil = null;
             return Result.FromError(banResult.Error);
         }
 
-        var memberData = data.GetOrCreateMemberData(target.ID);
-        memberData.BannedUntil
-            = duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
         memberData.Roles.Clear();
 
         var embed = new EmbedBuilder().WithSmallTitle(
diff --git a/src/Commands/KickCommandGroup.cs b/src/Commands/KickCommandGroup.cs
index 0faa1d3..59c4045 100644
--- a/src/Commands/KickCommandGroup.cs
+++ b/src/Commands/KickCommandGroup.cs
@@ -143,17 +143,19 @@ public class KickCommandGroup : CommandGroup
             await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
         }
 
+        var memberData = data.GetOrCreateMemberData(target.ID);
+        memberData.Kicked = true;
+
         var kickResult = await _guildApi.RemoveGuildMemberAsync(
             guild.ID, target.ID, $"({executor.GetTag()}) {reason}".EncodeHeader(),
             ct);
         if (!kickResult.IsSuccess)
         {
+            memberData.Kicked = false;
             return Result.FromError(kickResult.Error);
         }
 
-        var memberData = data.GetOrCreateMemberData(target.ID);
         memberData.Roles.Clear();
-        memberData.Kicked = true;
 
         var title = string.Format(Messages.UserKicked, target.GetTag());
         var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));