NadekoBot Patronage system, Search commands improvements + fixes

src/NadekoBot/Modules/Help/Help.cs

@@ -212,7 +212,7 @@ public partial class Help : NadekoModule<HelpService>
                 cmds = cmds.Where(x => succ.Contains(x)).ToList();
         }
 
-        var cmdsWithGroup = cmds.GroupBy(c => c.Module.Name.Replace("Commands", "", StringComparison.InvariantCulture))
+        var cmdsWithGroup = cmds.GroupBy(c => c.Module.GetGroupName())
                                 .OrderBy(x => x.Key == x.First().Module.Name ? int.MaxValue : x.Count())
                                 .ToList();
 
@@ -294,7 +294,7 @@ public partial class Help : NadekoModule<HelpService>
 
         if (fail.StartsWith(prefix))
             fail = fail.Substring(prefix.Length);
-        
+
         var group = _cmds.Modules
                          .SelectMany(x => x.Submodules)
                          .Where(x => !string.IsNullOrWhiteSpace(x.Group))
@@ -393,11 +393,6 @@ public partial class Help : NadekoModule<HelpService>
             };
 
             using var dlClient = new AmazonS3Client(accessKey, secretAcccessKey, config);
-            using var oldVersionObject = await dlClient.GetObjectAsync(new()
-            {
-                BucketName = "nadeko-pictures",
-                Key = "cmds/versions.json"
-            });
 
             using (var client = new AmazonS3Client(accessKey, secretAcccessKey, config))
             {
@@ -407,14 +402,29 @@ public partial class Help : NadekoModule<HelpService>
                     ContentType = "application/json",
                     ContentBody = uploadData,
                     // either use a path provided in the argument or the default one for public nadeko, other/cmds.json
-                    Key = $"cmds/{StatsService.BOT_VERSION}.json",
+                    Key = $"cmds/v4/{StatsService.BOT_VERSION}.json",
                     CannedACL = S3CannedACL.PublicRead
                 });
             }
 
-            await using var ms = new MemoryStream();
-            await oldVersionObject.ResponseStream.CopyToAsync(ms);
-            var versionListString = Encoding.UTF8.GetString(ms.ToArray());
+
+            var versionListString = "[]";
+            try
+            {
+                using var oldVersionObject = await dlClient.GetObjectAsync(new()
+                {
+                    BucketName = "nadeko-pictures",
+                    Key = "cmds/v4/versions.json"
+                });
+
+                await using var ms = new MemoryStream();
+                await oldVersionObject.ResponseStream.CopyToAsync(ms);
+                versionListString = Encoding.UTF8.GetString(ms.ToArray());
+            }
+            catch (Exception)
+            {
+                Log.Information("No old version list found. Creating a new one.");
+            }
 
             var versionList = JsonSerializer.Deserialize<List<string>>(versionListString);
             if (versionList is not null && !versionList.Contains(StatsService.BOT_VERSION))
@@ -435,7 +445,7 @@ public partial class Help : NadekoModule<HelpService>
                     ContentType = "application/json",
                     ContentBody = versionListString,
                     // either use a path provided in the argument or the default one for public nadeko, other/cmds.json
-                    Key = "cmds/versions.json",
+                    Key = "cmds/v4/versions.json",
                     CannedACL = S3CannedACL.PublicRead
                 });
             }
@@ -455,9 +465,71 @@ public partial class Help : NadekoModule<HelpService>
     [Cmd]
     public async partial Task Guide()
         => await ConfirmLocalizedAsync(strs.guide("https://nadeko.bot/commands",
-            "http://nadekobot.readthedocs.io/en/latest/"));
+            "https://nadekobot.readthedocs.io/en/latest/"));
+
+
+    private Task SelfhostAction(SocketMessageComponent smc)
+        => smc.RespondConfirmAsync(_eb,
+            @"- In case you don't want or cannot Donate to NadekoBot project, but you 
+- NadekoBot is a completely free and fully [open source](https://gitlab.com/kwoth/nadekobot) project which means you can run your own ""selfhosted"" instance on your computer or server for free.
+
+*Keep in mind that running the bot on your computer means that the bot will be offline when you turn off your computer*
+
+- You can find the selfhosting guides by using the `.guide` command and clicking on the second link that pops up.
+- If you decide to selfhost the bot, still consider [supporting the project](https://patreon.com/join/nadekobot) to keep the development going :)",
+            true);
 
     [Cmd]
+    [OnlyPublicBot]
     public async partial Task Donate()
-        => await ReplyConfirmLocalizedAsync(strs.donate(PATREON_URL, PAYPAL_URL));
+    {
+        var selfhostInter = new DonateSelfhostingInteraction(_client, ctx.User.Id, SelfhostAction);
+        
+        var eb = _eb.Create(ctx)
+                    .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"
+                             + "Donating will give you access to some exclusive features. You can read about them on the [patreon page](https://patreon.com/join/nadekobot)")
+            .AddField("Donation Instructions",
+                $@"
+🗒️ Before pledging it is recommended to open your DMs as Nadeko will send you a welcome message with instructions after you pledge has been processed and confirmed.
+
+**Step 1:** ❤️ Pledge on Patreon ❤️
+
+`1.` Go to <https://patreon.com/join/nadekobot> and choose a tier.
+`2.` Make sure your payment is processed and accepted.
+
+**Step 2** 🤝 Connect your Discord account 🤝
+
+`1.` Go to your profile settings on Patreon and connect your Discord account to it.
+*please make sure you're logged into the correct Discord account*
+
+If you do not know how to do it, you may follow instructions in this link:
+<https://support.patreon.com/hc/en-us/articles/212052266-How-do-I-connect-Discord-to-Patreon-Patron->
+
+**Step 3** ⏰ Wait a short while (usually 1-3 minutes) ⏰
+  
+Nadeko will DM you the welcome instructions, and you may start using the patron-only commands and features!
+🎉 **Enjoy!** 🎉
+")
+            .AddField("Troubleshooting",
+                @"
+*In case you didn't receive the rewards within 5 minutes:*
+`1.` Make sure your DMs are open to everyone. Maybe your pledge was processed successfully but the bot was unable to DM you. Use the `.patron` command to check your status.
+`2.` Make sure you've connected the CORRECT Discord account. Quite often users log in to different Discord accounts in their browser. You may also try disconnecting and reconnecting your account.
+`3.` Make sure your payment has been processed and not declined by Patreon.
+`4.` If any of the previous steps don't help, you can join the nadeko support server <https://discord.nadeko.bot> and ask for help in the #help channel");
+
+        try
+        {
+            await (await ctx.User.CreateDMChannelAsync()).EmbedAsync(eb, inter: selfhostInter.GetInteraction());
+            _ = ctx.OkAsync();
+        }
+        catch
+        {
+            await ReplyErrorLocalizedAsync(strs.cant_dm);
+        }
+    }
 }