Keep track of manual dehoists, don't remove them on unmute

Author: FloatingMilkshake

Commands/DehoistCmds.cs

@@ -38,6 +38,7 @@ await member.ModifyAsync(a =>
                     a.Nickname = DehoistHelpers.DehoistName(member.DisplayName);
                     a.AuditLogReason = $"[Dehoist by {DiscordHelpers.UniqueUsername(ctx.User)}]";
                 });
+                await Program.redis.SetAddAsync("manualDehoists", user.Id);
             }
             catch
             {

Events/MemberEvents.cs

@@ -236,6 +236,12 @@ await e.Member.ModifyAsync(a =>
 
             DehoistHelpers.CheckAndDehoistMemberAsync(e.Member);
 
+            // If member is not dehoisted but is in manualDehoists, remove them
+            if (e.Member.Nickname is null
+                || (e.Member.Nickname[0] != DehoistHelpers.dehoistCharacter
+                && await Program.redis.SetContainsAsync("manualDehoists", e.Member.Id)))
+                await Program.redis.SetRemoveAsync("manualDehoists", e.Member.Id);
+
             // Persist permadehoists
             if (await redis.SetContainsAsync("permadehoists", e.Member.Id))
                 if (e.Member.DisplayName[0] != DehoistHelpers.dehoistCharacter && !e.Member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) && !e.Member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))

Helpers/MuteHelpers.cs

@@ -465,7 +465,8 @@ await LogChannelHelper.LogMessageAsync("mod",
             await Program.redis.HashDeleteAsync("mutes", targetUser.Id);
 
             // attempt to undehoist member if they should not otherwise be hoisted
-            if (member.Nickname is not null
+            if (!await Program.redis.SetContainsAsync("manualDehoists", member.Id)
+                && member.Nickname is not null
                 && member.Nickname[0] == DehoistHelpers.dehoistCharacter
                 && !Program.cfgjson.AutoDehoistCharacters.Contains(member.Nickname[1])
                 && !Program.cfgjson.SecondaryAutoDehoistCharacters.Contains(member.Nickname[1])