Disallow TQS-mutes if the user is already muted

Author: FloatingMilkshake

Commands/InteractionCommands/MuteInteractions.cs

@@ -109,6 +109,18 @@ public async Task TqsMuteSlashCommand(
                 return;
             }
 
+            // Check if the user is already muted; disallow TQS-mute if so
+            
+            DiscordRole mutedRole = ctx.Guild.GetRole(Program.cfgjson.MutedRole);
+            DiscordRole tqsMutedRole = ctx.Guild.GetRole(Program.cfgjson.TqsMutedRole);
+            
+            if (await Program.db.HashExistsAsync("mutes", targetUser.Id) || ctx.Member.Roles.Contains(mutedRole) || ctx.Member.Roles.Contains(tqsMutedRole))
+            {
+                await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, that user is already muted."));
+                return;
+            }
+            
+            // Get member
             DiscordMember targetMember = default;
             try
             {
@@ -119,6 +131,7 @@ public async Task TqsMuteSlashCommand(
                 // blah
             }
 
+            // Check if user to be muted is staff or TQS, and disallow if so
             if (targetMember != default && GetPermLevel(ctx.Member) == ServerPermLevel.TechnicalQueriesSlayer && (GetPermLevel(targetMember) >= ServerPermLevel.TechnicalQueriesSlayer || targetMember.IsBot))
             {
                 await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, you cannot mute other TQS or staff members."));

Commands/Mutes.cs

@@ -113,6 +113,18 @@ public async Task TqsMuteCmd(
                 return;
             }
 
+            // Check if the user is already muted; disallow TQS-mute if so
+            
+            DiscordRole mutedRole = ctx.Guild.GetRole(Program.cfgjson.MutedRole);
+            DiscordRole tqsMutedRole = ctx.Guild.GetRole(Program.cfgjson.TqsMutedRole);
+            
+            if ((await Program.db.HashExistsAsync("mutes", targetUser.Id)) || (ctx.Member != default && (ctx.Member.Roles.Contains(mutedRole) || ctx.Member.Roles.Contains(tqsMutedRole))))
+            {
+                await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, that user is already muted.");
+                return;
+            }
+            
+            // Get member
             DiscordMember targetMember = default;
             try
             {
@@ -123,6 +135,7 @@ public async Task TqsMuteCmd(
                 // blah
             }
 
+            // Check if user to be muted is staff or TQS, and disallow if so
             if (targetMember != default && GetPermLevel(ctx.Member) == ServerPermLevel.TechnicalQueriesSlayer && (GetPermLevel(targetMember) >= ServerPermLevel.TechnicalQueriesSlayer || targetMember.IsBot))
             {
                 await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, you cannot mute other TQS or staff members.");