diff --git a/locale/Messages.resx b/locale/Messages.resx index b9dadee..31ed7b3 100644 --- a/locale/Messages.resx +++ b/locale/Messages.resx @@ -570,7 +570,4 @@ <data name="MessagesClearedFiltered" xml:space="preserve"> <value>Cleared {0} messages from {1}</value> </data> - <data name="ReminderSelectedPosition" xml:space="preserve"> - <value>Selected position in list: {0}</value> - </data> </root> diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx index 2b01f57..cb65749 100644 --- a/locale/Messages.ru.resx +++ b/locale/Messages.ru.resx @@ -570,7 +570,4 @@ <data name="MessagesClearedFiltered" xml:space="preserve"> <value>Очищено {0} сообщений от {1}</value> </data> - <data name="ReminderSelectedPosition" xml:space="preserve"> - <value>Выбранная позиция в списке: {0}</value> - </data> </root> diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx index 086ba72..b5f6ad1 100644 --- a/locale/Messages.tt-ru.resx +++ b/locale/Messages.tt-ru.resx @@ -570,7 +570,4 @@ <data name="MessagesClearedFiltered" xml:space="preserve"> <value>вырезано {0} забавных сообщений от {1}</value> </data> - <data name="ReminderSelectedPosition" xml:space="preserve"> - <value>селекнутый номер в списке: {0}</value> - </data> </root> diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs index 5e6cd71..4a4f6a1 100644 --- a/src/Commands/RemindCommandGroup.cs +++ b/src/Commands/RemindCommandGroup.cs @@ -195,14 +195,12 @@ 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, bot, CancellationToken); + return await DeleteReminderAsync(data.GetOrCreateMemberData(executorId), position - 1, bot, CancellationToken); } - private async Task<Result> DeleteReminderAsync(MemberData data, int position, IUser bot, + private async Task<Result> DeleteReminderAsync(MemberData data, int index, IUser bot, CancellationToken ct) { - var index = position - 1; - if (index >= data.Reminders.Count) { var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.InvalidReminderPosition, bot) @@ -212,14 +210,9 @@ 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 9bc1994..4a771d0 100644 --- a/src/Messages.Designer.cs +++ b/src/Messages.Designer.cs @@ -996,13 +996,5 @@ namespace Octobot { return ResourceManager.GetString("MessagesClearedFiltered", resourceCulture); } } - - internal static string ReminderSelectedPosition - { - get - { - return ResourceManager.GetString("ReminderSelectedPosition", resourceCulture); - } - } } }