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

Address requested changes

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-08-12 18:44:39 +05:00
parent 8615729b8d
commit a65bb26aee
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locale/Messages.ru.resx
View file

@ -586,7 +586,7 @@
<value>Напоминания {0}</value> <value>Напоминания {0}</value>
</data> </data>
<data name="InvalidReminderIndex" xml:space="preserve"> <data name="InvalidReminderIndex" xml:space="preserve">
<value>У тебя нет упоминания с указанным индексом!</value> <value>У тебя нет напоминания с указанным индексом!</value>
</data> </data>
<data name="ReminderDeleted" xml:space="preserve"> <data name="ReminderDeleted" xml:space="preserve">
<value>Напоминание удалено</value> <value>Напоминание удалено</value>

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

@ -589,6 +589,6 @@
<value>у тебя нет напоминалки с этим индексом!</value> <value>у тебя нет напоминалки с этим индексом!</value>
</data> </data>
<data name="ReminderDeleted" xml:space="preserve"> <data name="ReminderDeleted" xml:space="preserve">
<value>напоминалка стёрта</value> <value>напоминалка уничтожена</value>
</data> </data>
</root> </root>

10
src/Commands/RemindCommandGroup.cs
View file

@ -73,13 +73,14 @@ public class RemindCommandGroup : CommandGroup
for (var i = 0; i < data.Reminders.Count; i++) for (var i = 0; i < data.Reminders.Count; i++)
{ {
var reminder = data.Reminders[i]; var reminder = data.Reminders[i];
builder.AppendLine($"[{i}] {Markdown.InlineCode(reminder.Text)} ({Markdown.Timestamp(reminder.At)})"); builder.AppendLine(
$"- {Markdown.InlineCode(i.ToString())} - {Markdown.InlineCode(reminder.Text)} - {Markdown.Timestamp(reminder.At)}");
} }
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())
.WithColour(ColorsList.Default) .WithColour(ColorsList.Cyan)
.Build(); .Build();
return await _feedback.SendContextualEmbedResultAsync( return await _feedback.SendContextualEmbedResultAsync(
@ -152,7 +153,7 @@ public class RemindCommandGroup : CommandGroup
[RequireContext(ChannelContext.Guild)] [RequireContext(ChannelContext.Guild)]
[UsedImplicitly] [UsedImplicitly]
public async Task<Result> ExecuteDeleteReminderAsync( public async Task<Result> ExecuteDeleteReminderAsync(
int index) [MinValue(0)] int index)
{ {
if (!_context.TryGetContextIDs(out var guildId, out _, out var userId)) if (!_context.TryGetContextIDs(out var guildId, out _, out var userId))
{ {
@ -171,7 +172,8 @@ public class RemindCommandGroup : CommandGroup
return await DeleteReminderAsync(data.GetOrCreateMemberData(userId), index, currentUser, CancellationToken); return await DeleteReminderAsync(data.GetOrCreateMemberData(userId), index, currentUser, CancellationToken);
} }
private async Task<Result> DeleteReminderAsync(MemberData data, int index, IUser currentUser, CancellationToken ct) private async Task<Result> DeleteReminderAsync(MemberData data, int index, IUser currentUser,
CancellationToken ct)
{ {
if (index >= data.Reminders.Count) if (index >= data.Reminders.Count)
{ {