Actually don't dehoist members who are quarantined for a bad guild tag

Author: FloatingMilkshake

Commands/DehoistCmds.cs

@@ -192,7 +192,7 @@ public async Task MassUndhoist(TextCommandContext ctx)
                         continue;
                     }
 
-                    if (member.DisplayName[0] == DehoistHelpers.dehoistCharacter && !member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername))
+                    if (member.DisplayName[0] == DehoistHelpers.dehoistCharacter && !member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) && !member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))
                     {
                         var newNickname = member.Nickname[1..];
                         await member.ModifyAsync(a =>

Events/MemberEvents.cs

@@ -238,7 +238,7 @@ await e.Member.ModifyAsync(a =>
 
             // Persist permadehoists
             if (await redis.SetContainsAsync("permadehoists", e.Member.Id))
-                if (e.Member.DisplayName[0] != DehoistHelpers.dehoistCharacter && !e.Member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername))
+                if (e.Member.DisplayName[0] != DehoistHelpers.dehoistCharacter && !e.Member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) && !e.Member.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))
                     // Member is in permadehoist list. Dehoist.
                     e.Member.ModifyAsync(a =>
                     {

Helpers/DehoistHelpers.cs

@@ -24,7 +24,7 @@ public static async Task<bool> CheckAndDehoistMemberAsync(DiscordMember targetMe
                 displayName = targetMember.DisplayName;
             }
 
-            if ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TrialModerator || targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername))
+            if ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TrialModerator || targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) || targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))
             {
                 Program.discord.Logger.LogDebug("Skipped dehoisting member {member}: member is moderator or is automod-quarantined", targetMember.Id);
                 return false;
@@ -75,7 +75,7 @@ await targetMember.ModifyAsync(a =>
                 if (ex is DSharpPlus.Exceptions.BadRequestException)
                 {
                     Program.discord.Logger.LogInformation(Program.CliptokEventID, "Failed to dehoist member {memberId}! Discord said Bad Request. If this member's profile is in violation of AutoMod rules, this is expected!", targetMember.Id);
-                    Program.discord.Logger.LogDebug("Failed to dehoist {memberId} with error Bad Request! Member has quarantined flag: {isQuarantined}; all flags: {memberFlags}", targetMember.Id, targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername), targetMember.MemberFlags.Value);
+                    Program.discord.Logger.LogDebug("Failed to dehoist {memberId} with error Bad Request! Member is quarantined for username: {isUsernameQuarantined}; member is quarantined for guild tag: {isGuildTagQuarantined}; all flags: {memberFlags}", targetMember.Id, targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername), targetMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag), targetMember.MemberFlags.Value);
                 }
 
                 Program.discord.Logger.LogDebug(ex, "Failed to dehoist {memberId} with unexpected error:", targetMember.Id);
@@ -105,7 +105,7 @@ await targetMember.ModifyAsync(a =>
             // If member is dehoisted already, but NOT permadehoisted, skip updating nickname.
 
             // If member is not dehoisted
-            if (discordMember.DisplayName[0] != dehoistCharacter && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername))
+            if (discordMember.DisplayName[0] != dehoistCharacter && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))
             {
                 // Dehoist member
                 try
@@ -158,7 +158,7 @@ await discordMember.ModifyAsync(a =>
                 }
 
                 // Un-dehoist member
-                if (discordMember.DisplayName[0] == dehoistCharacter && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername))
+                if (discordMember.DisplayName[0] == dehoistCharacter && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedUsername) && !discordMember.MemberFlags.Value.HasFlag(DiscordMemberFlags.AutomodQuarantinedGuildTag))
                 {
                     var newNickname = discordMember.DisplayName[1..];
                     try