Automatically delete ban messages for compromised account bans

Erisa · Dec 22, 2024 · 42404b0 · 42404b0
1 parent 50b1a0f
commit 42404b0
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 24 deletions.
diff --git a/Commands/Bans.cs b/Commands/Bans.cs
@@ -207,11 +207,6 @@ public async Task BankeepCmd(CommandContext ctx,
                     return;
                 }
             }
-            reason = reason.Replace("`", "\\`").Replace("*", "\\*");
-            if (banDuration == default)
-                await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} {targetMember.Mention} has been banned: **{reason}**");
-            else
-                await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} {targetMember.Mention} has been banned for **{TimeHelpers.TimeToPrettyFormat(banDuration, false)}**: **{reason}**");
         }
 
         [Command("unban")]

diff --git a/Commands/InteractionCommands/BanInteractions.cs b/Commands/InteractionCommands/BanInteractions.cs
@@ -103,11 +103,6 @@ public async Task BanSlashCommand(InteractionContext ctx,
                     return;
                 }
             }
-            reason = reason.Replace("`", "\\`").Replace("*", "\\*");
-            if (banDuration == default)
-                await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} {user.Mention} has been banned: **{reason}**");
-            else
-                await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} {user.Mention} has been banned for **{TimeHelpers.TimeToPrettyFormat(banDuration, false)}**: **{reason}**");
 
             webhookOut.Content = $"{Program.cfgjson.Emoji.Success} User was successfully bonked.";
             await ctx.EditResponseAsync(webhookOut);

diff --git a/Helpers/BanHelpers.cs b/Helpers/BanHelpers.cs
@@ -18,17 +18,16 @@ public static async Task<bool> BanFromServerAsync(ulong targetUserId, string rea
                 expireTime = null;
             }
 
-            MemberPunishment newBan = new()
+            (DiscordMessage? dmMessage, DiscordMessage? chatMessage) output = new();
+
+            reason = reason.Replace("`", "\\`").Replace("*", "\\*");
+            if (channel is not null)
             {
-                MemberId = targetUserId,
-                ModId = moderatorId,
-                ServerId = guild.Id,
-                ExpireTime = expireTime,
-                ActionTime = actionTime,
-                Reason = reason
-            };
-
-            await Program.db.HashSetAsync("bans", targetUserId, JsonConvert.SerializeObject(newBan));
+                if (banDuration == default)
+                    output.chatMessage = await channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} <@{targetUserId}> has been banned: **{reason}**");
+                else
+                    output.chatMessage = await channel.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} <@{targetUserId}> has been banned for **{TimeHelpers.TimeToPrettyFormat(banDuration, false)}**: **{reason}**");
+            }
 
             try
             {
@@ -38,24 +37,54 @@ public static async Task<bool> BanFromServerAsync(ulong targetUserId, string rea
                     if (appealable)
                     {
                         if (compromisedAccount)
-                            await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}**!\nReason: **{reason}**\nYou can appeal the ban here: <{Program.cfgjson.AppealLink}>\nBefore appealing, please follow these steps to protect your account:\n1. Reset your Discord account password. Even if you use MFA, this will reset all session tokens.\n2. Review active sessions and authorised app connections.\n3. Ensure your PC is free of malware.\n4. [Enable MFA](https://support.discord.com/hc/en-us/articles/219576828-Setting-up-Multi-Factor-Authentication) if not already.");
+                            output.dmMessage = await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}**!\nReason: **{reason}**\nYou can appeal the ban here: <{Program.cfgjson.AppealLink}>\nBefore appealing, please follow these steps to protect your account:\n1. Reset your Discord account password. Even if you use MFA, this will reset all session tokens.\n2. Review active sessions and authorised app connections.\n3. Ensure your PC is free of malware.\n4. [Enable MFA](https://support.discord.com/hc/en-us/articles/219576828-Setting-up-Multi-Factor-Authentication) if not already.");
                         else
-                            await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}**!\nReason: **{reason}**\nYou can appeal the ban here: <{Program.cfgjson.AppealLink}>");
+                            output.dmMessage = await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}**!\nReason: **{reason}**\nYou can appeal the ban here: <{Program.cfgjson.AppealLink}>");
                     }
                     else
                     {
-                        await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been permanently banned from **{guild.Name}**!\nReason: **{reason}**");
+                        output.dmMessage = await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been permanently banned from **{guild.Name}**!\nReason: **{reason}**");
                     }
                 }
                 else
                 {
-                    await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}** for {TimeHelpers.TimeToPrettyFormat(banDuration, false)}!\nReason: **{reason}**\nBan expires: <t:{TimeHelpers.ToUnixTimestamp(expireTime)}:R>");
+                    output.dmMessage = await targetMember.SendMessageAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}** for {TimeHelpers.TimeToPrettyFormat(banDuration, false)}!\nReason: **{reason}**\nBan expires: <t:{TimeHelpers.ToUnixTimestamp(expireTime)}:R>");
                 }
             }
             catch
             {
                 // A DM failing to send isn't important.
             }
+
+            MemberPunishment newBan = new()
+            {
+                MemberId = targetUserId,
+                ModId = moderatorId,
+                ServerId = guild.Id,
+                ExpireTime = expireTime,
+                ActionTime = actionTime,
+                Reason = reason
+            };
+
+            if (output.chatMessage is not null)
+                newBan.ContextMessageReference = new()
+                {
+                    MessageId = output.chatMessage.Id,
+                    ChannelId = output.chatMessage.ChannelId
+                };
+
+            if (output.dmMessage is not null)
+                newBan!.DmMessageReference = new()
+                {
+                    MessageId = output.dmMessage.Id,
+                    ChannelId = output.dmMessage.ChannelId
+                };
+
+            await Program.db.HashSetAsync("bans", targetUserId, JsonConvert.SerializeObject(newBan));
+
+            // If ban is for a compromised account, add to list so the context message can be more-easily deleted later
+            if (compromisedAccount)
+                Program.db.HashSet("compromisedAccountBans", targetUserId, JsonConvert.SerializeObject(newBan));
 
             try
             {

diff --git a/Program.cs b/Program.cs
@@ -249,6 +249,7 @@ static async Task Main(string[] _)
                         Tasks.PunishmentTasks.CheckMutesAsync(),
                         Tasks.PunishmentTasks.CheckBansAsync(),
                         Tasks.PunishmentTasks.CheckAutomaticWarningsAsync(),
+                        Tasks.PunishmentTasks.CheckCompromisedAccountBansAsync(),
                         Tasks.ReminderTasks.CheckRemindersAsync(),
                         Tasks.RaidmodeTasks.CheckRaidmodeAsync(cfgjson.ServerID),
                         Tasks.LockdownTasks.CheckUnlocksAsync(),

diff --git a/Structs.cs b/Structs.cs
@@ -286,6 +286,9 @@ public class ConfigJson
 
         [JsonProperty("autoWarnMsgAutoDeleteDays")]
         public int AutoWarnMsgAutoDeleteDays { get; private set; }
+
+        [JsonProperty("compromisedAccountBanMsgAutoDeleteDays")]
+        public int CompromisedAccountBanMsgAutoDeleteDays { get; private set; }
 
         [JsonProperty("logLevel")]
         public Level LogLevel { get; private set; } = Level.Information;

diff --git a/Tasks/PunishmentTasks.cs b/Tasks/PunishmentTasks.cs
@@ -98,6 +98,48 @@ public static async Task<bool> CheckAutomaticWarningsAsync()
                 return success;
             }
         }
+
+        public static async Task<bool> CheckCompromisedAccountBansAsync()
+        {
+            if (Program.cfgjson.CompromisedAccountBanMsgAutoDeleteDays == 0)
+                return false;
+
+            Dictionary<string, MemberPunishment> banList = Program.db.HashGetAll("compromisedAccountBans").ToDictionary(
+                x => x.Name.ToString(),
+                x => JsonConvert.DeserializeObject<MemberPunishment>(x.Value)
+            );
+
+            if (banList.Keys.Count == 0)
+                return false;
+            else
+            {
+                // The success value will be changed later if any of the message deletes are successful.
+                bool success = false;
+                foreach (KeyValuePair<string, MemberPunishment> entry in banList)
+                {
+                    MemberPunishment ban = entry.Value;
+
+                    if (DateTime.Now > ban.ActionTime.Value.AddDays(Program.cfgjson.CompromisedAccountBanMsgAutoDeleteDays))
+                    {
+                        try
+                        {
+                            var contextMessage = await DiscordHelpers.GetMessageFromReferenceAsync(ban.ContextMessageReference);
+                            await contextMessage.DeleteAsync();
+                            Program.db.HashDelete("compromisedAccountBans", ban.MemberId);
+                            success = true;
+                        }
+                        catch (NullReferenceException)
+                        {
+                            // it's fine. trust me. we'll live.
+                            Program.db.HashDelete("compromisedAccountBans", ban.MemberId);
+                            continue;
+                        }
+                    }
+                }
+                Program.discord.Logger.LogDebug(Program.CliptokEventID, "Checked compromised account bans at {time} with result: {result}", DateTime.Now, success);
+                return success;
+            }
+        }
     }
 
 }
diff --git a/config.json b/config.json
@@ -322,6 +322,7 @@
   "tqsMutedRole": 752821045408563230,
   "tqsMuteDurationHours": 2,
   "autoWarnMsgAutoDeleteDays": 3,
+  "compromisedAccountBanMsgAutoDeleteDays": 3,
   "logLevel": "Debug",
   "lokiURL": "http://100.79.19.82:3100",
   "lokiServiceName": "cliptok",