Properly reapply TQS mutes on rejoin

Erisa · Mar 4, 2024 · 6e13987 · 6e13987
1 parent 9cfc867
commit 6e13987
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Events/MemberEvents.cs b/Events/MemberEvents.cs
@@ -127,12 +127,13 @@ public static async Task GuildMemberRemoved(DiscordClient client, GuildMemberRem
                 return;
 
             var muteRole = e.Guild.GetRole(cfgjson.MutedRole);
+            var tqsMuteRole = e.Guild.GetRole(cfgjson.TqsMutedRole);
             var userMute = await db.HashGetAsync("mutes", e.Member.Id);
 
-            if (!userMute.IsNull && !e.Member.Roles.Contains(muteRole))
+            if (!userMute.IsNull && !e.Member.Roles.Contains(muteRole) & !e.Member.Roles.Contains(tqsMuteRole))
                 db.HashDeleteAsync("mutes", e.Member.Id);
 
-            if (e.Member.Roles.Contains(muteRole) && userMute.IsNull)
+            if ((e.Member.Roles.Contains(muteRole) || e.Member.Roles.Contains(tqsMuteRole)) && userMute.IsNull)
             {
                 MemberPunishment newMute = new()
                 {
@@ -146,7 +147,7 @@ public static async Task GuildMemberRemoved(DiscordClient client, GuildMemberRem
                 db.HashSetAsync("mutes", e.Member.Id, JsonConvert.SerializeObject(newMute));
             }
 
-            if (!userMute.IsNull && !e.Member.Roles.Contains(muteRole))
+            if (!userMute.IsNull && !e.Member.Roles.Contains(muteRole) && !e.Member.Roles.Contains(tqsMuteRole))
                 db.HashDeleteAsync("mutes", e.Member.Id);
 
             string rolesStr = "None";