From c90b744fec82c58777537fa4403b9e2cd6740fae Mon Sep 17 00:00:00 2001 From: mctaylors Date: Thu, 26 Oct 2023 16:38:30 +0300 Subject: [PATCH] Add more info output to /delremind Signed-off-by: mctaylors --- locale/Messages.resx | 3 +++ locale/Messages.ru.resx | 3 +++ locale/Messages.tt-ru.resx | 3 +++ src/Commands/RemindCommandGroup.cs | 11 +++++++++-- src/Messages.Designer.cs | 8 ++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/locale/Messages.resx b/locale/Messages.resx index 31ed7b3..b9dadee 100644 --- a/locale/Messages.resx +++ b/locale/Messages.resx @@ -570,4 +570,7 @@ Cleared {0} messages from {1} + + Selected position in list: {0} + diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx index cb65749..2b01f57 100644 --- a/locale/Messages.ru.resx +++ b/locale/Messages.ru.resx @@ -570,4 +570,7 @@ Очищено {0} сообщений от {1} + + Выбранная позиция в списке: {0} + diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx index b5f6ad1..086ba72 100644 --- a/locale/Messages.tt-ru.resx +++ b/locale/Messages.tt-ru.resx @@ -570,4 +570,7 @@ вырезано {0} забавных сообщений от {1} + + селекнутый номер в списке: {0} + diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs index 4a4f6a1..5e6cd71 100644 --- a/src/Commands/RemindCommandGroup.cs +++ b/src/Commands/RemindCommandGroup.cs @@ -195,12 +195,14 @@ public class RemindCommandGroup : CommandGroup var data = await _guildData.GetData(guildId, CancellationToken); Messages.Culture = GuildSettings.Language.Get(data.Settings); - return await DeleteReminderAsync(data.GetOrCreateMemberData(executorId), position - 1, bot, CancellationToken); + return await DeleteReminderAsync(data.GetOrCreateMemberData(executorId), position, bot, CancellationToken); } - private async Task DeleteReminderAsync(MemberData data, int index, IUser bot, + private async Task DeleteReminderAsync(MemberData data, int position, IUser bot, CancellationToken ct) { + var index = position - 1; + if (index >= data.Reminders.Count) { var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.InvalidReminderPosition, bot) @@ -210,9 +212,14 @@ public class RemindCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct); } + var description = new StringBuilder() + .Append("- ").AppendLine(string.Format(Messages.ReminderSelectedPosition, Markdown.InlineCode(position.ToString()))) + .Append("- ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(data.Reminders[index].Text))); + data.Reminders.RemoveAt(index); var embed = new EmbedBuilder().WithSmallTitle(Messages.ReminderDeleted, bot) + .WithDescription(description.ToString()) .WithColour(ColorsList.Green) .Build(); diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs index 4a771d0..9bc1994 100644 --- a/src/Messages.Designer.cs +++ b/src/Messages.Designer.cs @@ -996,5 +996,13 @@ namespace Octobot { return ResourceManager.GetString("MessagesClearedFiltered", resourceCulture); } } + + internal static string ReminderSelectedPosition + { + get + { + return ResourceManager.GetString("ReminderSelectedPosition", resourceCulture); + } + } } }