From 2fbd1a6a202d0c686667469cafceb726df96696f Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Thu, 3 Aug 2023 00:05:05 +0500 Subject: [PATCH] correct comments, get rid of "else"s Signed-off-by: Octol1ttle --- src/Commands/ClearCommandGroup.cs | 3 +- src/Commands/SettingsCommandGroup.cs | 50 +++++++++++++------------- src/Responders/GuildLoadedResponder.cs | 4 +-- src/Services/GuildUpdateService.cs | 17 +++++---- src/Services/UtilityService.cs | 10 +----- 5 files changed, 38 insertions(+), 46 deletions(-) diff --git a/src/Commands/ClearCommandGroup.cs b/src/Commands/ClearCommandGroup.cs index 5ad8b33..f9ac630 100644 --- a/src/Commands/ClearCommandGroup.cs +++ b/src/Commands/ClearCommandGroup.cs @@ -100,9 +100,8 @@ public class ClearCommandGroup : CommandGroup { var idList = new List(messages.Count); var builder = new StringBuilder().AppendLine(Mention.Channel(channelId)).AppendLine(); - for (var i = messages.Count - 1; i >= 1; i--) + for (var i = messages.Count - 1; i >= 1; i--) // '>= 1' to skip last message ('Boyfriend is thinking...') { - // '>= 1' to skip last message ('Boyfriend is thinking...') var message = messages[i]; idList.Add(message.ID); builder.AppendLine(string.Format(Messages.MessageFrom, Mention.User(message.Author))); diff --git a/src/Commands/SettingsCommandGroup.cs b/src/Commands/SettingsCommandGroup.cs index 758bd83..687d49f 100644 --- a/src/Commands/SettingsCommandGroup.cs +++ b/src/Commands/SettingsCommandGroup.cs @@ -105,39 +105,37 @@ public class SettingsCommandGroup : CommandGroup if (firstOptionOnPage >= AllOptions.Length) { - var embed = new EmbedBuilder().WithSmallTitle(Messages.PageNotFound, currentUser) + var errorEmbed = new EmbedBuilder().WithSmallTitle(Messages.PageNotFound, currentUser) .WithDescription(string.Format(Messages.PagesAllowed, Markdown.Bold(totalPages.ToString()))) .WithColour(ColorsList.Red) .Build(); - return await _feedback.SendContextualEmbedResultAsync(embed, ct); + return await _feedback.SendContextualEmbedResultAsync(errorEmbed, ct); } - else + + footer.Append($"{Messages.Page} {page}/{totalPages} "); + for (var i = 0; i < totalPages; i++) { - 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); - } - - var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingsListTitle, currentUser) - .WithDescription(description.ToString()) - .WithColour(ColorsList.Default) - .WithFooter(footer.ToString()) - .Build(); - - return await _feedback.SendContextualEmbedResultAsync(embed, ct); + 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); + } + + var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingsListTitle, currentUser) + .WithDescription(description.ToString()) + .WithColour(ColorsList.Default) + .WithFooter(footer.ToString()) + .Build(); + + return await _feedback.SendContextualEmbedResultAsync(embed, ct); } /// diff --git a/src/Responders/GuildLoadedResponder.cs b/src/Responders/GuildLoadedResponder.cs index 5c1ea9b..547e5ac 100644 --- a/src/Responders/GuildLoadedResponder.cs +++ b/src/Responders/GuildLoadedResponder.cs @@ -35,9 +35,9 @@ public class GuildLoadedResponder : IResponder public async Task RespondAsync(IGuildCreate gatewayEvent, CancellationToken ct = default) { - if (!gatewayEvent.Guild.IsT0) + if (!gatewayEvent.Guild.IsT0) // Guild is not IAvailableGuild { - return Result.FromSuccess(); // Guild is not IAvailableGuild + return Result.FromSuccess(); } var guild = gatewayEvent.Guild.AsT0; diff --git a/src/Services/GuildUpdateService.cs b/src/Services/GuildUpdateService.cs index 6d7a611..752f3c2 100644 --- a/src/Services/GuildUpdateService.cs +++ b/src/Services/GuildUpdateService.cs @@ -165,8 +165,10 @@ public sealed partial class GuildUpdateService : BackgroundService if (!eventsResult.IsSuccess) { _logger.LogWarning("Error retrieving scheduled events.\n{ErrorMessage}", eventsResult.Error.Message); + return; } - else if (!GuildSettings.EventNotificationChannel.Get(data.Settings).Empty()) + + if (!GuildSettings.EventNotificationChannel.Get(data.Settings).Empty()) { await TickScheduledEventsAsync(guildId, data, eventsResult.Entity, ct); } @@ -272,15 +274,14 @@ public sealed partial class GuildUpdateService : BackgroundService { var unbanResult = await _guildApi.RemoveGuildBanAsync( guildId, user.ID, Messages.PunishmentExpired.EncodeHeader(), ct); - if (unbanResult.IsSuccess) - { - memberData.BannedUntil = null; - } - else + if (!unbanResult.IsSuccess) { _logger.LogWarning( "Error in automatic user unban request.\n{ErrorMessage}", unbanResult.Error.Message); + return; } + + memberData.BannedUntil = null; } for (var i = memberData.Reminders.Count - 1; i >= 0; i--) @@ -307,8 +308,10 @@ public sealed partial class GuildUpdateService : BackgroundService { characterList.Remove(character); usernameChanged = true; + continue; } - else { break; } + + break; } if (!usernameChanged) diff --git a/src/Services/UtilityService.cs b/src/Services/UtilityService.cs index 0387fd7..35a11dd 100644 --- a/src/Services/UtilityService.cs +++ b/src/Services/UtilityService.cs @@ -180,15 +180,7 @@ public sealed class UtilityService : IHostedService } builder = users.Where( - user => - { - if (!user.GuildMember.IsDefined(out var member)) - { - return true; - } - - return !member.Roles.Contains(role); - }) + user => user.GuildMember.IsDefined(out var member) && !member.Roles.Contains(role)) .Aggregate(builder, (current, user) => current.Append($"{Mention.User(user.User)} ")); return builder.ToString(); }