Handle cases where TQS mute role is not configured

Erisa · Sep 12, 2024 · 1a60926 · 1a60926
1 parent e7c3e64
commit 1a60926
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/Commands/InteractionCommands/MuteInteractions.cs b/Commands/InteractionCommands/MuteInteractions.cs
@@ -101,6 +101,13 @@ public async Task TqsMuteSlashCommand(
         {
             await ctx.DeferAsync(ephemeral: true);
 
+            // only work if TQS mute role is configured
+            if (Program.cfgjson.TqsMutedRole == 0)
+            {
+                await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"{Program.cfgjson.Emoji.Error} TQS mutes are not configured, so this command does nothing. Please contact the bot maintainer if this is unexpected."));
+                return;
+            }
+
             // Only allow usage in #tech-support, #tech-support-forum, and their threads
             if (ctx.Channel.Id != Program.cfgjson.TechSupportChannel &&
                 ctx.Channel.Id != Program.cfgjson.SupportForumId &&

diff --git a/Commands/Mutes.cs b/Commands/Mutes.cs
@@ -12,7 +12,9 @@ public async Task UnmuteCmd(CommandContext ctx, [Description("The user you're tr
 
             // todo: store per-guild
             DiscordRole mutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.MutedRole);
-            DiscordRole tqsMutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.TqsMutedRole);
+            DiscordRole tqsMutedRole = default;
+            if (Program.cfgjson.TqsMutedRole != 0)
+                tqsMutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.TqsMutedRole);
 
             DiscordMember member = default;
             try
@@ -103,6 +105,12 @@ public async Task TqsMuteCmd(
             CommandContext ctx, [Description("The user to mute")] DiscordUser targetUser,
             [RemainingText, Description("The reason for the mute")] string reason = "No reason specified.")
         {
+            if (Program.cfgjson.TqsMutedRole == 0)
+            {
+                await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} TQS mutes are not configured, so this command does nothing. Please contact the bot maintainer if this is unexpected.");
+                return;
+            }
+
             // Only allow usage in #tech-support, #tech-support-forum, and their threads
             if (ctx.Channel.Id != Program.cfgjson.TechSupportChannel &&
                 ctx.Channel.Id != Program.cfgjson.SupportForumId &&

diff --git a/Events/MemberEvents.cs b/Events/MemberEvents.cs
@@ -106,7 +106,11 @@ public static async Task GuildMemberRemoved(DiscordClient client, GuildMemberRem
                 return;
 
             var muteRole = await e.Guild.GetRoleAsync(cfgjson.MutedRole);
-            var tqsMuteRole = await e.Guild.GetRoleAsync(cfgjson.TqsMutedRole);
+
+            DiscordRole tqsMuteRole = default;
+            if (cfgjson.TqsMutedRole != 0)
+                tqsMuteRole = await e.Guild.GetRoleAsync(cfgjson.TqsMutedRole);
+
             var userMute = await db.HashGetAsync("mutes", e.Member.Id);
 
             if (!userMute.IsNull && !e.Member.Roles.Contains(muteRole) & !e.Member.Roles.Contains(tqsMuteRole))

diff --git a/Helpers/MuteHelpers.cs b/Helpers/MuteHelpers.cs
@@ -318,7 +318,10 @@ public static async Task<bool> UnmuteUserAsync(DiscordUser targetUser, string re
 
             // todo: store per-guild
             DiscordRole mutedRole = await guild.GetRoleAsync(Program.cfgjson.MutedRole);
-            DiscordRole tqsMutedRole = await guild.GetRoleAsync(Program.cfgjson.TqsMutedRole);
+            DiscordRole tqsMutedRole = default;
+            if (Program.cfgjson.TqsMutedRole != 0)
+                tqsMutedRole = await Program.homeGuild.GetRoleAsync(Program.cfgjson.TqsMutedRole);
+
             DiscordMember member = default;
             try
             {

diff --git a/Structs.cs b/Structs.cs
@@ -279,7 +279,7 @@ public class ConfigJson
         public ulong InsiderCanaryThread { get; set; } = 0;
 
         [JsonProperty("tqsMutedRole")]
-        public ulong TqsMutedRole { get; private set; }
+        public ulong TqsMutedRole { get; private set; } = 0;
 
         [JsonProperty("tqsMuteDurationHours")]
         public int TqsMuteDurationHours { get; private set; }