From 350fa32f08cf7bc38885711cdc41ad91936b19b4 Mon Sep 17 00:00:00 2001 From: mctaylors <95250141+mctaylors@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:17:52 +0300 Subject: [PATCH] better than better code --- src/Commands/SettingsCommandGroup.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Commands/SettingsCommandGroup.cs b/src/Commands/SettingsCommandGroup.cs index d680c6d..9bfbc95 100644 --- a/src/Commands/SettingsCommandGroup.cs +++ b/src/Commands/SettingsCommandGroup.cs @@ -90,10 +90,9 @@ public class SettingsCommandGroup : CommandGroup { const int optionsPerPage = 10; - var totalPages = (AllOptions.Length + optionsPerPage - 1)/optionsPerPage; - var lastOptionOnPage = optionsPerPage * page; - var firstOptionOnPage = lastOptionOnPage - optionsPerPage; - var condition = lastOptionOnPage > AllOptions.Length ? AllOptions.Length : lastOptionOnPage; + var totalPages = (AllOptions.Length + optionsPerPage - 1) / optionsPerPage; + var lastOptionOnPage = Math.Min(optionsPerPage * page, AllOptions.Length); + var firstOptionOnPage = optionsPerPage * page - optionsPerPage; if (firstOptionOnPage >= AllOptions.Length) { var embed = new EmbedBuilder().WithSmallTitle(Messages.PageNotFound, currentUser) @@ -106,7 +105,7 @@ public class SettingsCommandGroup : CommandGroup { footer.Append($"{Messages.Page} {page}/{totalPages} "); for (var i = 0; i < totalPages; i++) footer.Append(i + 1 == page ? "●" : "○"); - for (var i = firstOptionOnPage; i < condition; i++) { + for (var i = firstOptionOnPage; i < lastOptionOnPage; i++) { var optionName = AllOptions[i].Name; var optionValue = AllOptions[i].Display(cfg);