Rewrite lockdown (#249)

* Rewrite lockdown * Remove boolean return values from lockdown helpers
Erisa · Dec 16, 2024 · 50b1a0f · 50b1a0f
1 parent 43176ea
commit 50b1a0f
Show file tree

Hide file tree

Showing 2 changed files with 151 additions and 170 deletions.
diff --git a/Commands/InteractionCommands/LockdownInteractions.cs b/Commands/InteractionCommands/LockdownInteractions.cs
@@ -57,11 +57,15 @@ await thread.ModifyAsync(a =>
                     return;
                 }
 
-                bool success = await LockdownHelpers.LockChannelAsync(user: ctx.User, channel: currentChannel, duration: lockDuration, reason: reason, lockThreads: lockThreads);
-                if (success)
+                try
+                {
+                    await LockdownHelpers.LockChannelAsync(user: ctx.User, channel: currentChannel, duration: lockDuration, reason: reason, lockThreads: lockThreads);
                     await ctx.FollowUpAsync(new DiscordFollowupMessageBuilder().WithContent("Channel locked successfully.").AsEphemeral(true));
-                else
+                }
+                catch (ArgumentException)
+                {
                     await ctx.FollowUpAsync(new DiscordFollowupMessageBuilder().WithContent("Failed to lock this channel!").AsEphemeral(true));
+                }
             }
 
             [SlashCommand("all", "Lock all lockable channels in the server. See also: unlock all")]
@@ -123,11 +127,15 @@ public class UnlockCmds
                     await ctx.FollowUpAsync(new DiscordFollowupMessageBuilder().WithContent($"{Program.cfgjson.Emoji.Error} A mass lockdown or unlock is already ongoing. Refusing your request. sorry.").AsEphemeral(true));
                     return;
                 }
-                bool success = await LockdownHelpers.UnlockChannel(currentChannel, ctx.Member);
-                if (success)
+                try
+                {
+                    await LockdownHelpers.UnlockChannel(currentChannel, ctx.Member);
                     await ctx.FollowUpAsync(new DiscordFollowupMessageBuilder().WithContent("Channel unlocked successfully.").AsEphemeral(true));
-                else
+                }
+                catch (ArgumentException)
+                {
                     await ctx.FollowUpAsync(new DiscordFollowupMessageBuilder().WithContent("Failed to unlock this channel!").AsEphemeral(true));
+                }
             }
 
             [SlashCommand("all", "Unlock all lockable channels in the server. See also: lockdown all")]