Run Code Cleanup

Author: Erisa

CommandChecks/HomeServerPerms.cs

@@ -35,7 +35,7 @@ public static async Task<ServerPermLevel> GetPermLevelAsync(DiscordMember target
                 return ServerPermLevel.Admin;
 
             bool HasRole(ulong roleId) => target.Roles.Any(r => r.Id == roleId);
-            
+
             return HasRole(Program.cfgjson.AdminRole) ? ServerPermLevel.Admin
                 : HasRole(Program.cfgjson.ModRole) ? ServerPermLevel.Moderator
                 : HasRole(Program.cfgjson.MutedRole) ? ServerPermLevel.Muted

Commands/AnnouncementCmds.cs

@@ -5,7 +5,7 @@ public class AnnouncementCmds
         // used to pass context to modal handling for /editannounce
         // keyed by user ID
         public static Dictionary<ulong, (ulong msgId, string role1, string role2)> EditAnnounceCache = new();
-        
+
         [Command("announcebuild")]
         [Description("Announce a Windows Insider build in the current channel.")]
         [AllowedProcessors(typeof(SlashCommandProcessor))]
@@ -51,13 +51,13 @@ public async Task AnnounceBuildSlashCommand(SlashCommandContext ctx,
                 await ctx.RespondAsync(text: $"{Program.cfgjson.Emoji.Error} Windows 10 only has a Release Preview Channel.", ephemeral: true);
                 return;
             }
-            
+
             if (threadChannel != default && threadChannel == threadChannel2)
             {
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} Both threads cannot be the same! Simply set one instead.", ephemeral: true);
                 return;
             }
-            
+
             if (threadChannel == default && threadChannel2 != default)
             {
                 threadChannel = threadChannel2;
@@ -188,7 +188,7 @@ public async Task AnnounceBuildSlashCommand(SlashCommandContext ctx,
                                 threadChannel = await ctx.Client.GetChannelAsync(Program.cfgjson.InsiderThreads["rp"]);
                             break;
                     }
-                    
+
                     switch (insiderChannel2)
                     {
                         case "Canary":
@@ -207,7 +207,7 @@ public async Task AnnounceBuildSlashCommand(SlashCommandContext ctx,
                                 threadChannel2 = await ctx.Client.GetChannelAsync(Program.cfgjson.InsiderThreads["rp"]);
                             break;
                     }
-                        
+
                     pingMsgString += $"\n\nDiscuss it here: {threadChannel.Mention}";
                     if (threadChannel2 != default)
                         pingMsgString += $" & {threadChannel2.Mention}";
@@ -258,7 +258,7 @@ public async Task AnnounceBuildSlashCommand(SlashCommandContext ctx,
                                 threadChannel = await ctx.Client.GetChannelAsync(Program.cfgjson.InsiderThreads["rp"]);
                             break;
                     }
-                    
+
                     switch (insiderChannel2)
                     {
                         case "Canary":
@@ -277,7 +277,7 @@ public async Task AnnounceBuildSlashCommand(SlashCommandContext ctx,
                                 threadChannel2 = await ctx.Client.GetChannelAsync(Program.cfgjson.InsiderThreads["rp"]);
                             break;
                     }
-                        
+
                     noPingMsgString += $"\n\nDiscuss it here: {threadChannel.Mention}";
                     if (threadChannel2 != default)
                         noPingMsgString += $" & {threadChannel2.Mention}";
@@ -384,13 +384,13 @@ public async Task EditAnnounce(
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That message ID wasn't recognised!", ephemeral: true);
                 return;
             }
-            
+
             if (msg.Author.Id != ctx.Client.CurrentUser.Id)
             {
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That message wasn't sent by me, so I can't edit it!", ephemeral: true);
                 return;
             }
-            
+
             // Validate roles
             if (!Program.cfgjson.AnnouncementRoles.ContainsKey(role1Name) || (role2Name is not null && !Program.cfgjson.AnnouncementRoles.ContainsKey(role2Name)))
             {
@@ -402,12 +402,12 @@ public async Task EditAnnounce(
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Warning} You provided the same role name twice! Did you mean to use two different roles?", ephemeral: true);
                 return;
             }
-            
+
             EditAnnounceCache[ctx.User.Id] = (Convert.ToUInt64(messageId), role1Name, role2Name);
 
             await ctx.RespondWithModalAsync(new DiscordInteractionResponseBuilder().WithTitle("Edit Announcement").WithCustomId("editannounce-modal-callback").AddTextInputComponent(new DiscordTextInputComponent("New announcement text. Do not include roles!", "editannounce-modal-new-text", value: msg.Content, style: DiscordTextInputStyle.Paragraph)));
         }
-        
+
         [Command("announce")]
         [Description("Announces something in the current channel, pinging an Insider role in the process.")]
         [HomeServer, RequireHomeserverPerm(ServerPermLevel.Moderator)]
@@ -431,7 +431,7 @@ public async Task AnounceSlashCmd(SlashCommandContext ctx,
                 await ctx.RespondAsync(text: $"{Program.cfgjson.Emoji.Error} Windows 10 only has a Release Preview Channel.", ephemeral: true);
                 return;
             }
-            
+
             string roleKey1;
             if (windowsVersion == 10 && insiderChannel1 == "RP")
             {
@@ -465,7 +465,7 @@ public async Task AnounceSlashCmd(SlashCommandContext ctx,
 
                 insiderRole2 = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles[roleKey2]);
             }
-            
+
             await insiderRole1.ModifyAsync(mentionable: true);
             if (insiderRole2 != default)
                 await insiderRole2.ModifyAsync(mentionable: true);
@@ -486,7 +486,7 @@ public async Task AnounceSlashCmd(SlashCommandContext ctx,
             await insiderRole1.ModifyAsync(mentionable: false);
             if (insiderRole2 != default)
                 await insiderRole2.ModifyAsync(mentionable: false);
-            
+
             await ctx.RespondAsync($"{Program.cfgjson.Emoji.Success} Announcement sent successfully!");
         }
 
@@ -632,7 +632,7 @@ public async ValueTask<IEnumerable<DiscordApplicationCommandOptionChoice>> Provi
                 };
             }
         }
-        
+
         internal class AnnouncementRoleChoiceProvider : IChoiceProvider
         {
             public async ValueTask<IEnumerable<DiscordApplicationCommandOptionChoice>> ProvideAsync(CommandParameter _)

Commands/BanCmds.cs

@@ -441,7 +441,7 @@ public async Task BankeepCmd(TextCommandContext ctx,
                 }
             }
         }
-        
+
         [Command("editbantextcmd")]
         [TextAlias("editban")]
         [Description("Edit the details of a ban. Updates the DM to the user, among other things.")]
@@ -457,39 +457,39 @@ public async Task EditBanCmd(TextCommandContext ctx,
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} There's no record of a ban for that user! Please make sure they're banned or you got the right user.");
                 return;
             }
-            
+
             (TimeSpan banDuration, string reason, bool appealable) = PunishmentHelpers.UnpackTimeAndReason(timeAndReason, ctx.Message.Timestamp.DateTime);
 
             var ban = JsonConvert.DeserializeObject<MemberPunishment>(await Program.redis.HashGetAsync("bans", targetUser.Id));
-            
+
             ban.ModId = ctx.User.Id;
             if (banDuration == default)
                 ban.ExpireTime = null;
             else
                 ban.ExpireTime = ban.ActionTime + banDuration;
             ban.Reason = reason;
-            
+
             var guild = await Program.discord.GetGuildAsync(ban.ServerId);
-            
+
             var contextMessage = await DiscordHelpers.GetMessageFromReferenceAsync(ban.ContextMessageReference);
             var dmMessage = await DiscordHelpers.GetMessageFromReferenceAsync(ban.DmMessageReference);
-            
+
             reason = reason.Replace("`", "\\`").Replace("*", "\\*");
-            
+
             if (contextMessage is not null)
             {
                 string newCtxMsg;
                 if (banDuration == default)
                     newCtxMsg = $"{Program.cfgjson.Emoji.Banned} {targetUser.Mention} has been banned: **{reason}**";
                 else
                     newCtxMsg = $"{Program.cfgjson.Emoji.Banned} {targetUser.Mention} has been banned for **{TimeHelpers.TimeToPrettyFormat(banDuration, false)}**: **{reason}**";
-                
+
                 if (contextMessage.Content.Contains("-# This user's messages have been kept."))
                     newCtxMsg += "\n-# This user's messages have been kept.";
-                
+
                 await contextMessage.ModifyAsync(newCtxMsg);
             }
-            
+
             if (dmMessage is not null)
             {
                 if (ban.ExpireTime == null)
@@ -511,12 +511,12 @@ public async Task EditBanCmd(TextCommandContext ctx,
                     await dmMessage.ModifyAsync($"{Program.cfgjson.Emoji.Banned} You have been banned from **{guild.Name}** for {TimeHelpers.TimeToPrettyFormat(banDuration, false)}!\nReason: **{reason}**\nBan expires: <t:{TimeHelpers.ToUnixTimestamp(ban.ExpireTime)}:R>");
                 }
             }
-            
+
             await Program.redis.HashSetAsync("bans", targetUser.Id.ToString(), JsonConvert.SerializeObject(ban));
-            
+
             // Construct log message
             string logOut = $"{Program.cfgjson.Emoji.MessageEdit} The ban for {targetUser.Mention} was edited by {ctx.User.Mention}!\nReason: **{reason}**";
-            
+
             if (ban.ExpireTime == null)
             {
                 logOut += "\nBan expires: **Never**"
@@ -526,10 +526,10 @@ public async Task EditBanCmd(TextCommandContext ctx,
             {
                 logOut += $"\nBan expires: <t:{TimeHelpers.ToUnixTimestamp(ban.ExpireTime)}:R>";
             }
-            
+
             // Log to mod log
             await LogChannelHelper.LogMessageAsync("mod", logOut);
-            
+
             await ctx.RespondAsync($"{Program.cfgjson.Emoji.Success} Successfully edited the ban for {targetUser.Mention}!");
         }
     }

Commands/ClearCmds.cs

@@ -24,7 +24,7 @@ public async Task ClearSlashCommand(SlashCommandContext ctx,
         )
         {
             await ctx.DeferResponseAsync(ephemeral: !dryRun);
-            
+
             if (channel is null)
                 channel = ctx.Channel;
 

Commands/DebugCmds.cs

@@ -1,4 +1,3 @@
-using Cliptok.Helpers;
 using Microsoft.EntityFrameworkCore;
 
 namespace Cliptok.Commands
@@ -159,7 +158,8 @@ public async Task Restart(TextCommandContext ctx)
                 {
                     await ctx.RespondAsync("Invalid argument. Make sure you know what you are doing.");
 
-                };
+                }
+                ;
             }
 
             [Command("refresh")]

Commands/FunCmds.cs

@@ -1,5 +1,3 @@
-using Cliptok.Constants;
-
 namespace Cliptok.Commands
 {
     public class FunCmds

Commands/GlobalCmds.cs

@@ -116,7 +116,7 @@ await ctx.RespondAsync(
                     var defaultGroupCommand = cmd.Subcommands.FirstOrDefault(sc => sc.Attributes.Any(a => a is DefaultGroupCommandAttribute));
                     arguments = defaultGroupCommand?.Method?.GetParameters();
                 }
-                
+
                 if (arguments is not null && arguments.Length > 0)
                 {
                     var argumentsStr = $"`{cmd.Name.Replace("textcmd", "")}";
@@ -257,7 +257,7 @@ public async Task RemindMe(
         )
         {
             DateTime t = TimeHelpers.ParseAnyDateFormat(timetoParse);
-            
+
             if (t <= DateTime.Now)
             {
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} Time can't be in the past!");

Commands/ListCmds.cs

@@ -110,7 +110,7 @@ public async Task ListAdd(
             if (
                 Program.cfgjson.GitHubWorkflowPrivate is not null
                 && githubTokenPrivate is not null
-                && Directory.GetFiles($"Lists/{Program.cfgjson.GitListDirectory}").Any(x => x.EndsWith(fileName)) )
+                && Directory.GetFiles($"Lists/{Program.cfgjson.GitListDirectory}").Any(x => x.EndsWith(fileName)))
             {
                 workflowId = Program.cfgjson.GitHubWorkflowPrivate.WorkflowId;
                 refName = Program.cfgjson.GitHubWorkflowPrivate.Ref;
@@ -185,33 +185,33 @@ public async Task ScamCheck(CommandContext ctx, [Parameter("input"), Description
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} Anti-phishing API is not configured, nothing for me to do.");
             }
         }
-        
+
         [Command("invitecheck")]
         [Description("Check if a server invite is known to the malicious invites API.")]
         [AllowedProcessors(typeof(SlashCommandProcessor), typeof(TextCommandProcessor))]
         [RequireHomeserverPerm(ServerPermLevel.TrialModerator), RequirePermissions(DiscordPermission.ModerateMembers)]
         public async Task InviteCheck(CommandContext ctx, [Parameter("input"), Description("Server invite to scan.")] string content)
         {
             var inviteMatches = Constants.RegexConstants.invite_rx.Matches(content);
-            
+
             if (inviteMatches.Count == 0)
             {
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That doesn't look like a valid invite! Please try again.");
                 return;
             }
-            
+
             var invite = inviteMatches.First();
             ulong guildId;
             try
             {
-                guildId = (await Program.discord.GetInviteByCodeAsync(invite.Groups[1].Value)).Guild.Id;   
+                guildId = (await Program.discord.GetInviteByCodeAsync(invite.Groups[1].Value)).Guild.Id;
             }
             catch (DSharpPlus.Exceptions.NotFoundException)
             {
                 await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That invite isn't valid!");
                 return;
             }
-                
+
             var (match, httpStatus, responseString, _) = await APIs.ServerAPI.ServerAPICheckAsync(guildId);
 
             string responseToSend;