From 82d2bd1e302c7c41589018a484048da1bd3c9ece Mon Sep 17 00:00:00 2001 From: mctaylors <95250141+mctaylors@users.noreply.github.com> Date: Mon, 14 Aug 2023 10:41:48 +0300 Subject: [PATCH] resolving issues --- src/Commands/RemindCommandGroup.cs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs index 7bb2b89..263d1ba 100644 --- a/src/Commands/RemindCommandGroup.cs +++ b/src/Commands/RemindCommandGroup.cs @@ -61,14 +61,29 @@ public class RemindCommandGroup : CommandGroup return Result.FromError(userResult); } + var currentUserResult = await _userApi.GetCurrentUserAsync(CancellationToken); + if (!currentUserResult.IsDefined(out var currentUser)) + { + return Result.FromError(currentUserResult); + } + var data = await _guildData.GetData(guildId, CancellationToken); Messages.Culture = GuildSettings.Language.Get(data.Settings); - return await ListRemindersAsync(data.GetOrCreateMemberData(userId), user, CancellationToken); + return await ListRemindersAsync(data.GetOrCreateMemberData(userId), user, currentUser, CancellationToken); } - private async Task ListRemindersAsync(MemberData data, IUser user, CancellationToken ct) + private async Task ListRemindersAsync(MemberData data, IUser user, IUser currentUser, CancellationToken ct) { + if (data.Reminders.Count == 0) + { + var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.NoRemindersFound, currentUser) + .WithColour(ColorsList.Red) + .Build(); + + return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct); + } + var builder = new StringBuilder(); for (var i = 0; i < data.Reminders.Count; i++) { @@ -77,15 +92,6 @@ public class RemindCommandGroup : CommandGroup $"- {Markdown.InlineCode(i.ToString())} - {Markdown.InlineCode(reminder.Text)} - {Markdown.Timestamp(reminder.At)}"); } - if (data.Reminders.Count == 0) - { - var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.NoRemindersFound, user) - .WithColour(ColorsList.Red) - .Build(); - - return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct); - } - var embed = new EmbedBuilder().WithSmallTitle( string.Format(Messages.ReminderList, user.GetTag()), user) .WithDescription(builder.ToString())