Check for the new ServerAdmin module in the help commands.

Use SocketRole instead of getting a role by its name in AdminRole and ModRole.

Author: GreemDev

Volte/Core/Commands/Modules/Admin/AdminRoleCommand.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Discord;
+using Discord.WebSocket;
 using Qmmands;
 using Volte.Core.Commands.Preconditions;
 using Volte.Core.Extensions;
@@ -11,23 +12,18 @@ public partial class AdminModule : VolteModule
     {
         [Command("AdminRole")]
         [Description("Sets the role able to use Admin commands for the current guild.")]
-        [Remarks("Usage: |prefix|adminrole {roleName}")]
+        [Remarks("Usage: |prefix|adminrole {role}")]
         [RequireGuildAdmin]
-        public async Task AdminRoleAsync([Remainder] string roleName)
+        public async Task AdminRoleAsync(SocketRole role)
         {
             var embed = Context.CreateEmbed(string.Empty).ToEmbedBuilder();
             var config = Db.GetConfig(Context.Guild);
-            var role = Context.Guild.Roles.FirstOrDefault(r => r.Name.EqualsIgnoreCase(roleName));
             if (role != null)
             {
                 config.ModerationOptions.AdminRole = role.Id;
                 Db.UpdateConfig(config);
                 embed.WithDescription($"Set **{role.Name}** as the Admin role for this server.");
             }
-            else
-            {
-                embed.WithDescription($"**{roleName}** doesn't exist in this server.");
-            }
 
             await embed.SendTo(Context.Channel);
         }

Volte/Core/Commands/Modules/Admin/ModRoleCommand.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
+using Discord.WebSocket;
 using Qmmands;
 using Volte.Core.Commands.Preconditions;
 using Volte.Core.Extensions;
@@ -10,17 +11,12 @@ public partial class AdminModule : VolteModule
     {
         [Command("ModRole")]
         [Description("Sets the role able to use Moderation commands for the current guild.")]
-        [Remarks("Usage: |prefix|modrole {roleName}")]
+        [Remarks("Usage: |prefix|modrole {role}")]
         [RequireGuildAdmin]
-        public async Task ModRoleAsync([Remainder] string roleName)
+        public async Task ModRoleAsync(SocketRole role)
         {
             var config = Db.GetConfig(Context.Guild);
-            var role = Context.Guild.Roles.FirstOrDefault(r => r.Name.EqualsIgnoreCase(roleName));
-            if (role is null)
-            {
-                await Context.CreateEmbed($"{roleName} doesn't exist in this server.").SendTo(Context.Channel);
-            }
-            else
+            if (role != null)
             {
                 config.ModerationOptions.ModRole = role.Id;
                 Db.UpdateConfig(config);

Volte/Core/Commands/Modules/Help/CommandCommand.cs

@@ -22,7 +22,8 @@ public async Task CommandAsync([Remainder] string cmdName)
 
             if ((c.Module.SanitizeName().EqualsIgnoreCase("admin") && !UserUtil.IsAdmin(Context)) ||
                 (c.Module.SanitizeName().EqualsIgnoreCase("owner") && !UserUtil.IsBotOwner(Context.User)) ||
-                (c.Module.SanitizeName().EqualsIgnoreCase("moderation") && !UserUtil.IsModerator(Context)))
+                (c.Module.SanitizeName().EqualsIgnoreCase("moderation") && !UserUtil.IsModerator(Context)) ||
+                (c.Module.SanitizeName().EqualsIgnoreCase("serveradmin") && !UserUtil.IsAdmin(Context)))
             {
                 await Context.CreateEmbed($"{EmojiService.X} You don't have permission to use the module that command is from.")
                     .SendTo(Context.Channel);

Volte/Core/Commands/Modules/Help/CommandsCommand.cs

@@ -22,7 +22,8 @@ public async Task CommandsAsync(string module)
 
             if ((target.SanitizeName().EqualsIgnoreCase("admin") && !UserUtil.IsAdmin(Context)) ||
                 (target.SanitizeName().EqualsIgnoreCase("owner") && !UserUtil.IsBotOwner(Context.User)) ||
-                (target.SanitizeName().EqualsIgnoreCase("moderation") && !UserUtil.IsModerator(Context)))
+                (target.SanitizeName().EqualsIgnoreCase("moderation") && !UserUtil.IsModerator(Context)) ||
+                (target.SanitizeName().EqualsIgnoreCase("serveradmin") && !UserUtil.IsAdmin(Context)))
             {
                 await Context.CreateEmbed($"{EmojiService.X} You don't have permission to use the module that command is from.")
                     .SendTo(Context.Channel);

Volte/Core/Commands/Modules/Help/ModulesCommand.cs

@@ -12,8 +12,7 @@ public partial class HelpModule : VolteModule
         [Remarks("Usage: |prefix|modules")]
         public async Task ModulesAsync()
         {
-            var modules = CommandService.GetAllModules().Aggregate(string.Empty,
-                (current, module) => current + $"`{module.SanitizeName()}`, ");
+            var modules = $"`{string.Join("`, `", CommandService.GetAllModules().Select(x => x.SanitizeName()))}`";
             await Context.CreateEmbedBuilder(modules.Remove(modules.LastIndexOf(","))).WithTitle("Available Modules")
                 .SendTo(Context.Channel);
         }