Resolving issues on #65 (#72)

Signed-off-by: Macintosh II <95250141+mctaylors@users.noreply.github.com>

locale/Messages.resx

@@ -562,13 +562,13 @@
         <value>Rename members who attempt to hoist themselves</value>
     </data>
     <data name="Page" xml:space="preserve">
-        <value>page</value>
+        <value>Page</value>
     </data>
     <data name="PageNotFound" xml:space="preserve">
         <value>Page not found!</value>
     </data>
     <data name="PagesAllowed" xml:space="preserve">
-        <value>There are total pages</value>
+        <value>There are {0} total pages</value>
     </data>
     <data name="Next" xml:space="preserve">
         <value>Next</value>

locale/Messages.ru.resx

@@ -562,13 +562,13 @@
         <value>Переименовывать участников, которые пытаются поднять себя</value>
     </data>
     <data name="Page" xml:space="preserve">
-        <value>страница</value>
+        <value>Страница</value>
     </data>
     <data name="PageNotFound" xml:space="preserve">
         <value>Страница не найдена!</value>
     </data>
     <data name="PagesAllowed" xml:space="preserve">
-        <value>Всего страниц существует</value>
+        <value>Всего есть {0} страниц(-ы)</value>
     </data>
     <data name="Next" xml:space="preserve">
         <value>Далее</value>

locale/Messages.tt-ru.resx

@@ -568,7 +568,7 @@
         <value>если я был бы html, я бы сказал 404</value>
     </data>
     <data name="PagesAllowed" xml:space="preserve">
-        <value>ну а если быть точнее, тут всего страниц</value>
+        <value>ну а если быть точнее, тут всего {0} страниц(-ы)</value>
     </data>
     <data name="Next" xml:space="preserve">
         <value>следующее</value>

src/Commands/SettingsCommandGroup.cs

@@ -85,38 +85,44 @@ public class SettingsCommandGroup : CommandGroup {
     }
 
     private async Task<Result> SendSettingsListAsync(JsonNode cfg, IUser currentUser, int page, CancellationToken ct = default) {
-        var builder = new StringBuilder();
+        var description = new StringBuilder();
         var footer = new StringBuilder();
-        const int optionsPerList = 7;
+
-        var totalPages = (AllOptions.Length + optionsPerList - 1)/optionsPerList;
+        const int optionsPerPage = 10;
-        for (var i = optionsPerList * page - optionsPerList; i <= optionsPerList * page - 1; i++) {
+
-            try {
+        var totalPages = (AllOptions.Length + optionsPerPage - 1) / optionsPerPage;
-                builder.AppendLine($"Settings{AllOptions[i].Name}".Localized())
+        var lastOptionOnPage = Math.Min(optionsPerPage * page, AllOptions.Length);
-                    .Append(Markdown.InlineCode(AllOptions[i].Name))
+        var firstOptionOnPage = optionsPerPage * page - optionsPerPage;
-                    .Append(": ")
+
-                    .AppendLine(AllOptions[i].Display(cfg))
+        if (firstOptionOnPage >= AllOptions.Length) {
-                    .AppendLine();
+            var embed = new EmbedBuilder().WithSmallTitle(Messages.PageNotFound, currentUser)
-            } catch { /* hilariously ignored */ }
+                .WithDescription(string.Format(Messages.PagesAllowed, Markdown.Bold(totalPages.ToString())))
+                .WithColour(ColorsList.Red)
+                .Build();
+
+            return await _feedbackService.SendContextualEmbedResultAsync(embed, ct);
+        } else {
+            footer.Append($"{Messages.Page} {page}/{totalPages} ");
+            for (var i = 0; i < totalPages; i++) footer.Append(i + 1 == page ? "●" : "○");
+
+            for (var i = firstOptionOnPage; i < lastOptionOnPage; i++) {
+                var optionName = AllOptions[i].Name;
+                var optionValue = AllOptions[i].Display(cfg);
+
+                description.AppendLine($"- {$"Settings{optionName}".Localized()}")
+                    .Append($" - {Markdown.InlineCode(optionName)}: ")
+                    .AppendLine(optionValue);
             }
 
-        footer.Append($"{Messages.Page} {page}/{totalPages} ");
-        for (var i = 1; i <= totalPages; i++) footer.Append(i == page ? "●" : "○");
-
             var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingsListTitle, currentUser)
-            .WithDescription(builder.ToString())
+                .WithDescription(description.ToString())
                 .WithColour(ColorsList.Default)
                 .WithFooter(footer.ToString())
                 .Build();
 
-        if (optionsPerList * page - optionsPerList >= AllOptions.Length) {
-            embed = new EmbedBuilder().WithSmallTitle(Messages.PageNotFound, currentUser)
-                .WithDescription($"{Messages.PagesAllowed}: {Markdown.Bold(totalPages.ToString())}")
-                .WithColour(ColorsList.Red)
-                .Build();
-        }
-
             return await _feedbackService.SendContextualEmbedResultAsync(embed, ct);
         }
+    }
 
     /// <summary>
     /// A slash command that modifies per-guild GuildSettings.