TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-05-13 17:26:08 +03:00
Code Issues Wiki Activity

Revert "Add more info output to /delremind"

Browse source 
This reverts commit c90b744fec.
This commit is contained in:
Macintxsh 2023-10-26 17:01:49 +03:00
parent c90b744fec
commit 83ce2aa1cb
Signed by: mctaylors
GPG key ID: 194ED59274F61F79
5 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locale/Messages.resx
View file

@ -570,7 +570,4 @@
<data name="MessagesClearedFiltered" xml:space="preserve"> <data name="MessagesClearedFiltered" xml:space="preserve">
<value>Cleared {0} messages from {1}</value> <value>Cleared {0} messages from {1}</value>
</data> </data>
<data name="ReminderSelectedPosition" xml:space="preserve">
<value>Selected position in list: {0}</value>
</data>
</root> </root>

3
locale/Messages.ru.resx
View file

@ -570,7 +570,4 @@
<data name="MessagesClearedFiltered" xml:space="preserve"> <data name="MessagesClearedFiltered" xml:space="preserve">
<value>Очищено {0} сообщений от {1}</value> <value>Очищено {0} сообщений от {1}</value>
</data> </data>
<data name="ReminderSelectedPosition" xml:space="preserve">
<value>Выбранная позиция в списке: {0}</value>
</data>
</root> </root>

3
locale/Messages.tt-ru.resx
View file

@ -570,7 +570,4 @@
<data name="MessagesClearedFiltered" xml:space="preserve"> <data name="MessagesClearedFiltered" xml:space="preserve">
<value>вырезано {0} забавных сообщений от {1}</value> <value>вырезано {0} забавных сообщений от {1}</value>
</data> </data>
<data name="ReminderSelectedPosition" xml:space="preserve">
<value>селекнутый номер в списке: {0}</value>
</data>
</root> </root>

11
src/Commands/RemindCommandGroup.cs
View file

@ -195,14 +195,12 @@ public class RemindCommandGroup : CommandGroup
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 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) CancellationToken ct)
{ {
var index = position - 1;
if (index >= data.Reminders.Count) if (index >= data.Reminders.Count)
{ {
var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.InvalidReminderPosition, bot) var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.InvalidReminderPosition, bot)
@ -212,14 +210,9 @@ public class RemindCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct); 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); data.Reminders.RemoveAt(index);
var embed = new EmbedBuilder().WithSmallTitle(Messages.ReminderDeleted, bot) var embed = new EmbedBuilder().WithSmallTitle(Messages.ReminderDeleted, bot)
.WithDescription(description.ToString())
.WithColour(ColorsList.Green) .WithColour(ColorsList.Green)
.Build(); .Build();

8
src/Messages.Designer.cs generated
View file

@ -996,13 +996,5 @@ namespace Octobot {
return ResourceManager.GetString("MessagesClearedFiltered", resourceCulture); return ResourceManager.GetString("MessagesClearedFiltered", resourceCulture);
} }
} }
internal static string ReminderSelectedPosition
{
get
{
return ResourceManager.GetString("ReminderSelectedPosition", resourceCulture);
}
}
} }
} }