TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

resolving issues

Browse source
This commit is contained in:
Macintxsh 2023-08-14 10:41:48 +03:00
parent c6bace0157
commit 82d2bd1e30
Signed by: mctaylors
GPG key ID: 2E1BF7AD0D4BB0B4
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Commands/RemindCommandGroup.cs
View file

@ -61,14 +61,29 @@ public class RemindCommandGroup : CommandGroup
return Result.FromError(userResult); 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); var data = await _guildData.GetData(guildId, CancellationToken);
Messages.Culture = GuildSettings.Language.Get(data.Settings); 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<Result> ListRemindersAsync(MemberData data, IUser user, CancellationToken ct) private async Task<Result> 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(); var builder = new StringBuilder();
for (var i = 0; i < data.Reminders.Count; i++) 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)}"); $"- {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( var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.ReminderList, user.GetTag()), user) string.Format(Messages.ReminderList, user.GetTag()), user)
.WithDescription(builder.ToString()) .WithDescription(builder.ToString())