Cleaning up projects, project is building

src/Nadeko.Bot.Modules.Help/Help.cs

@@ -6,18 +6,20 @@ using NadekoBot.Modules.Help.Services;
 using Newtonsoft.Json;
 using System.Text;
 using System.Text.Json;
+using Nadeko.Bot.Common;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace NadekoBot.Modules.Help;
 
-public partial class Help : NadekoModule<HelpService>
+public sealed class Help : NadekoModule<HelpService>
 {
     public const string PATREON_URL = "https://patreon.com/nadekobot";
     public const string PAYPAL_URL = "https://paypal.me/Kwoth";
 
+    private readonly ICommandsUtilityService _cus;
     private readonly CommandService _cmds;
     private readonly BotConfigService _bss;
-    private readonly GlobalPermissionService _perms;
+    private readonly IPermissionChecker _perms;
     private readonly IServiceProvider _services;
     private readonly DiscordSocketClient _client;
     private readonly IBotStrings _strings;
@@ -26,7 +28,8 @@ public partial class Help : NadekoModule<HelpService>
     private readonly IMedusaLoaderService _medusae;
 
     public Help(
-        GlobalPermissionService perms,
+        ICommandsUtilityService _cus,
+        IPermissionChecker perms,
         CommandService cmds,
         BotConfigService bss,
         IServiceProvider services,
@@ -34,6 +37,7 @@ public partial class Help : NadekoModule<HelpService>
         IBotStrings strings,
         IMedusaLoaderService medusae)
     {
+        this._cus = _cus;
         _cmds = cmds;
         _bss = bss;
         _perms = perms;
@@ -53,11 +57,11 @@ public partial class Help : NadekoModule<HelpService>
 
         var clientId = await _lazyClientId.Value;
         var r = new ReplacementBuilder().WithDefault(Context)
-                                        .WithOverride("{0}", () => clientId.ToString())
-                                        .WithOverride("{1}", () => prefix)
-                                        .WithOverride("%prefix%", () => prefix)
-                                        .WithOverride("%bot.prefix%", () => prefix)
-                                        .Build();
+            .WithOverride("{0}", () => clientId.ToString())
+            .WithOverride("{1}", () => prefix)
+            .WithOverride("%prefix%", () => prefix)
+            .WithOverride("%bot.prefix%", () => prefix)
+            .Build();
 
         var text = SmartText.CreateFrom(botSettings.HelpText);
         return r.Replace(text);
@@ -69,10 +73,15 @@ public partial class Help : NadekoModule<HelpService>
         if (--page < 0)
             return;
 
-        var topLevelModules = _cmds.Modules.GroupBy(m => m.GetTopLevelModule())
-                                   .Where(m => !_perms.BlockedModules.Contains(m.Key.Name.ToLowerInvariant()))
-                                   .Select(x => x.Key)
-                                   .ToList();
+        var topLevelModules = new List<ModuleInfo>();
+        foreach (var m in _cmds.Modules.GroupBy(x => x.GetTopLevelModule()).Select(x => x.Key))
+        {
+            var result = await _perms.CheckAsync(ctx.Guild, ctx.Channel, ctx.User,
+                m.Name, null);
+
+            if (result.IsT0)
+                topLevelModules.Add(m);
+        }
 
         await ctx.SendPaginatedConfirmAsync(page,
             cur =>
@@ -88,12 +97,12 @@ public partial class Help : NadekoModule<HelpService>
                 }
 
                 localModules.OrderBy(module => module.Name)
-                            .ToList()
-                            .ForEach(module => embed.AddField($"{GetModuleEmoji(module.Name)} {module.Name}",
-                                GetModuleDescription(module.Name)
-                                + "\n"
-                                + Format.Code(GetText(strs.module_footer(prefix, module.Name.ToLowerInvariant()))),
-                                true));
+                    .ToList()
+                    .ForEach(module => embed.AddField($"{GetModuleEmoji(module.Name)} {module.Name}",
+                        GetModuleDescription(module.Name)
+                        + "\n"
+                        + Format.Code(GetText(strs.module_footer(prefix, module.Name.ToLowerInvariant()))),
+                        true));
 
                 return embed;
             },
@@ -109,11 +118,11 @@ public partial class Help : NadekoModule<HelpService>
         if (key.Key == strs.module_description_missing.Key)
         {
             var desc = _medusae
-                       .GetLoadedMedusae(Culture)
-                       .FirstOrDefault(m => m.Sneks
-                                             .Any(x => x.Name.Equals(moduleName,
-                                                 StringComparison.InvariantCultureIgnoreCase)))
-                       ?.Description;
+                .GetLoadedMedusae(Culture)
+                .FirstOrDefault(m => m.Sneks
+                    .Any(x => x.Name.Equals(moduleName,
+                        StringComparison.InvariantCultureIgnoreCase)))
+                ?.Description;
 
             if (desc is not null)
                 return desc;
@@ -150,6 +159,8 @@ public partial class Help : NadekoModule<HelpService>
                 return strs.module_description_xp;
             case "medusa":
                 return strs.module_description_medusa;
+            case "patronage":
+                return strs.module_description_patronage;
             default:
                 return strs.module_description_missing;
         }
@@ -182,6 +193,8 @@ public partial class Help : NadekoModule<HelpService>
                 return "🚓";
             case "xp":
                 return "📝";
+            case "patronage":
+                return "💝";
             default:
                 return "📖";
         }
@@ -191,7 +204,6 @@ public partial class Help : NadekoModule<HelpService>
     [NadekoOptions<CommandsOptions>]
     public async Task Commands(string module = null, params string[] args)
     {
-        module = module?.Trim().ToUpperInvariant();
         if (string.IsNullOrWhiteSpace(module))
         {
             await Modules();
@@ -203,14 +215,22 @@ public partial class Help : NadekoModule<HelpService>
         // Find commands for that module
         // don't show commands which are blocked
         // order by name
-        var cmds = _cmds.Commands
-                        .Where(c => c.Module.GetTopLevelModule()
-                                     .Name.ToUpperInvariant()
-                                     .StartsWith(module, StringComparison.InvariantCulture))
-                        .Where(c => !_perms.BlockedCommands.Contains(c.Aliases[0].ToLowerInvariant()))
-                        .OrderBy(c => c.Aliases[0])
-                        .DistinctBy(x => x.Aliases[0])
-                        .ToList();
+        var allowed = new List<CommandInfo>();
+
+        foreach (var cmd in _cmds.Commands
+                     .Where(c => c.Module.GetTopLevelModule()
+                         .Name
+                         .StartsWith(module, StringComparison.InvariantCultureIgnoreCase)))
+        {
+            var result = await _perms.CheckAsync(ctx.Guild, ctx.Channel, ctx.User, cmd.Module.GetTopLevelModule().Name,
+                cmd.Name);
+            if (result.IsT0)
+                allowed.Add(cmd);
+        }
+
+        var cmds = allowed.OrderBy(c => c.Aliases[0])
+            .DistinctBy(x => x.Aliases[0])
+            .ToList();
 
 
         // check preconditions for all commands, but only if it's not 'all'
@@ -219,12 +239,12 @@ public partial class Help : NadekoModule<HelpService>
         if (opts.View != CommandsOptions.ViewType.All)
         {
             succ = new((await cmds.Select(async x =>
-                                  {
-                                      var pre = await x.CheckPreconditionsAsync(Context, _services);
-                                      return (Cmd: x, Succ: pre.IsSuccess);
-                                  })
-                                  .WhenAll()).Where(x => x.Succ)
-                                             .Select(x => x.Cmd));
+                    {
+                        var pre = await x.CheckPreconditionsAsync(Context, _services);
+                        return (Cmd: x, Succ: pre.IsSuccess);
+                    })
+                    .WhenAll()).Where(x => x.Succ)
+                .Select(x => x.Cmd));
 
             if (opts.View == CommandsOptions.ViewType.Hide)
                 // if hidden is specified, completely remove these commands from the list
@@ -232,8 +252,8 @@ public partial class Help : NadekoModule<HelpService>
         }
 
         var cmdsWithGroup = cmds.GroupBy(c => c.Module.GetGroupName())
-                                .OrderBy(x => x.Key == x.First().Module.Name ? int.MaxValue : x.Count())
-                                .ToList();
+            .OrderBy(x => x.Key == x.First().Module.Name ? int.MaxValue : x.Count())
+            .ToList();
 
         if (cmdsWithGroup.Count == 0)
         {
@@ -253,28 +273,28 @@ public partial class Help : NadekoModule<HelpService>
             for (var i = 0; i < last; i++)
             {
                 var transformed = g.ElementAt(i)
-                                   .Select(x =>
-                                   {
-                                       //if cross is specified, and the command doesn't satisfy the requirements, cross it out
-                                       if (opts.View == CommandsOptions.ViewType.Cross)
-                                       {
-                                           return
-                                               $"{(succ.Contains(x) ? "✅" : "❌")}{prefix + x.Aliases.First(),-15} {"[" + x.Aliases.Skip(1).FirstOrDefault() + "]",-8}";
-                                       }
+                    .Select(x =>
+                    {
+                        //if cross is specified, and the command doesn't satisfy the requirements, cross it out
+                        if (opts.View == CommandsOptions.ViewType.Cross)
+                        {
+                            return
+                                $"{(succ.Contains(x) ? "✅" : "❌")}{prefix + x.Aliases.First(),-15} {"[" + x.Aliases.Skip(1).FirstOrDefault() + "]",-8}";
+                        }
 
-                                       return
-                                           $"{prefix + x.Aliases.First(),-15} {"[" + x.Aliases.Skip(1).FirstOrDefault() + "]",-8}";
-                                   });
+                        return
+                            $"{prefix + x.Aliases.First(),-15} {"[" + x.Aliases.Skip(1).FirstOrDefault() + "]",-8}";
+                    });
 
                 if (i == last - 1 && (i + 1) % 2 != 0)
                 {
                     transformed = transformed.Chunk(2)
-                                             .Select(x =>
-                                             {
-                                                 if (x.Count() == 1)
-                                                     return $"{x.First()}";
-                                                 return string.Concat(x);
-                                             });
+                        .Select(x =>
+                        {
+                            if (x.Count() == 1)
+                                return $"{x.First()}";
+                            return string.Concat(x);
+                        });
                 }
 
                 embed.AddField(g.ElementAt(i).Key, "```css\n" + string.Join("\n", transformed) + "\n```", true);
@@ -288,8 +308,8 @@ public partial class Help : NadekoModule<HelpService>
     private async Task Group(ModuleInfo group)
     {
         var eb = _eb.Create(ctx)
-                    .WithTitle(GetText(strs.cmd_group_commands(group.Name)))
-                    .WithOkColor();
+            .WithTitle(GetText(strs.cmd_group_commands(group.Name)))
+            .WithOkColor();
 
         foreach (var cmd in group.Commands)
         {
@@ -315,9 +335,9 @@ public partial class Help : NadekoModule<HelpService>
             fail = fail.Substring(prefix.Length);
 
         var group = _cmds.Modules
-                         .SelectMany(x => x.Submodules)
-                         .Where(x => !string.IsNullOrWhiteSpace(x.Group))
-                         .FirstOrDefault(x => x.Group.Equals(fail, StringComparison.InvariantCultureIgnoreCase));
+            .SelectMany(x => x.Submodules)
+            .Where(x => !string.IsNullOrWhiteSpace(x.Group))
+            .FirstOrDefault(x => x.Group.Equals(fail, StringComparison.InvariantCultureIgnoreCase));
 
         if (group is not null)
         {
@@ -343,8 +363,13 @@ public partial class Help : NadekoModule<HelpService>
                 if (data == default)
                     return;
                 await ch.SendAsync(data);
-                try { await ctx.OkAsync(); }
-                catch { } // ignore if bot can't react
+                try
+                {
+                    await ctx.OkAsync();
+                }
+                catch
+                {
+                } // ignore if bot can't react
             }
             catch (Exception)
             {
@@ -354,7 +379,7 @@ public partial class Help : NadekoModule<HelpService>
             return;
         }
 
-        var embed = _service.GetCommandHelp(com, ctx.Guild);
+        var embed = _cus.GetCommandHelp(com, ctx.Guild);
         await channel.EmbedAsync(embed);
     }
 
@@ -367,29 +392,29 @@ public partial class Help : NadekoModule<HelpService>
         // order commands by top level module name
         // and make a dictionary of <ModuleName, Array<JsonCommandData>>
         var cmdData = _cmds.Commands.GroupBy(x => x.Module.GetTopLevelModule().Name)
-                           .OrderBy(x => x.Key)
-                           .ToDictionary(x => x.Key,
-                               x => x.DistinctBy(c => c.Aliases.First())
-                                     .Select(com =>
-                                     {
-                                         List<string> optHelpStr = null;
-                                         
-                                         var opt = HelpService.GetNadekoOptionType(com.Attributes);
-                                         if (opt is not null)
-                                             optHelpStr = HelpService.GetCommandOptionHelpList(opt);
+            .OrderBy(x => x.Key)
+            .ToDictionary(x => x.Key,
+                x => x.DistinctBy(c => c.Aliases.First())
+                    .Select(com =>
+                    {
+                        List<string> optHelpStr = null;
 
-                                         return new CommandJsonObject
-                                         {
-                                             Aliases = com.Aliases.Select(alias => prefix + alias).ToArray(),
-                                             Description = com.RealSummary(_strings, _medusae, Culture, prefix),
-                                             Usage = com.RealRemarksArr(_strings, _medusae, Culture, prefix),
-                                             Submodule = com.Module.Name,
-                                             Module = com.Module.GetTopLevelModule().Name,
-                                             Options = optHelpStr,
-                                             Requirements = HelpService.GetCommandRequirements(com)
-                                         };
-                                     })
-                                     .ToList());
+                        var opt = CommandsUtilityService.GetNadekoOptionType(com.Attributes);
+                        if (opt is not null)
+                            optHelpStr = CommandsUtilityService.GetCommandOptionHelpList(opt);
+
+                        return new CommandJsonObject
+                        {
+                            Aliases = com.Aliases.Select(alias => prefix + alias).ToArray(),
+                            Description = com.RealSummary(_strings, _medusae, Culture, prefix),
+                            Usage = com.RealRemarksArr(_strings, _medusae, Culture, prefix),
+                            Submodule = com.Module.Name,
+                            Module = com.Module.GetTopLevelModule().Name,
+                            Options = optHelpStr,
+                            Requirements = CommandsUtilityService.GetCommandRequirements(com)
+                        };
+                    })
+                    .ToList());
 
         var readableData = JsonConvert.SerializeObject(cmdData, Formatting.Indented);
         var uploadData = JsonConvert.SerializeObject(cmdData, Formatting.None);
@@ -512,8 +537,8 @@ public partial class Help : NadekoModule<HelpService>
                 SelfhostAction));
 
         var eb = _eb.Create(ctx)
-                    .WithOkColor()
-                    .WithTitle("Thank you for considering to donate to the NadekoBot project!");
+            .WithOkColor()
+            .WithTitle("Thank you for considering to donate to the NadekoBot project!");
 
         eb
             .WithDescription("NadekoBot relies on donations to keep the servers, services and APIs running.\n"