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

nah bro cant just resolve 2 issues by 1 commit

Browse source 
Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
Macintxsh 2023-12-17 23:02:27 +03:00
parent d4ea62d419
commit be42ecfe03
Signed by: mctaylors
GPG key ID: 7181BEBE676903C1
5 changed files with 76 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
locale/Messages.resx
View file

@ -585,4 +585,10 @@
<data name="ButtonReportIssue" xml:space="preserve">
<value>Report an issue</value>
</data>
<data name="ReminderInvalidTimeSpan" xml:space="preserve">
<value>Incorrect reminder send time specified.</value>
</data>
<data name="ReminderNegativeTimeSpan" xml:space="preserve">
<value>Negative reminder send time specified.</value>
</data>
</root>

6
locale/Messages.ru.resx
View file

@ -585,4 +585,10 @@
<data name="ButtonReportIssue" xml:space="preserve">
<value>Сообщить о проблеме</value>
</data>
<data name="ReminderInvalidTimeSpan" xml:space="preserve">
<value>Указано некорректное время отправки напоминания.</value>
</data>
<data name="ReminderNegativeTimeSpan" xml:space="preserve">
<value>Указано отрицательное время отправки напоминания.</value>
</data>
</root>

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

@ -585,4 +585,10 @@
<data name="ButtonReportIssue" xml:space="preserve">
<value>зарепортить баг</value>
</data>
<data name="ReminderInvalidTimeSpan" xml:space="preserve">
<value>ты там правильно напиши когда мне тебя пинать</value>
</data>
<data name="ReminderNegativeTimeSpan" xml:space="preserve">
<value>ты там минусы не пиши когда мне тебя пинать</value>
</data>
</root>

50
src/Commands/RemindCommandGroup.cs
View file

@ -2,11 +2,13 @@ using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Text;
using JetBrains.Annotations;
using NGettext.Plural.Ast;
using Octobot.Data;
using Octobot.Extensions;
using Octobot.Services;
using Remora.Commands.Attributes;
using Remora.Commands.Groups;
using Remora.Commands.Parsers;
using Remora.Discord.API.Abstractions.Objects;
using Remora.Discord.API.Abstractions.Rest;
using Remora.Discord.Commands.Attributes;
@ -74,10 +76,12 @@ public class RemindCommandGroup : CommandGroup
var data = await _guildData.GetData(guildId, CancellationToken);
Messages.Culture = GuildSettings.Language.Get(data.Settings);
return await ListRemindersAsync(data.GetOrCreateMemberData(executorId), guildId, executor, bot, CancellationToken);
return await ListRemindersAsync(data.GetOrCreateMemberData(executorId), guildId, executor, bot,
CancellationToken);
}
private Task<Result> ListRemindersAsync(MemberData data, Snowflake guildId, IUser executor, IUser bot, CancellationToken ct)
private Task<Result> ListRemindersAsync(MemberData data, Snowflake guildId, IUser executor, IUser bot,
CancellationToken ct)
{
if (data.Reminders.Count == 0)
{
@ -92,10 +96,12 @@ public class RemindCommandGroup : CommandGroup
for (var i = 0; i < data.Reminders.Count; i++)
{
var reminder = data.Reminders[i];
builder.AppendBulletPointLine(string.Format(Messages.ReminderPosition, Markdown.InlineCode((i + 1).ToString())))
builder.AppendBulletPointLine(string.Format(Messages.ReminderPosition,
Markdown.InlineCode((i + 1).ToString())))
.AppendSubBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
.AppendSubBulletPointLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)))
.AppendSubBulletPointLine(string.Format(Messages.DescriptionActionJumpToMessage, $"https://discord.com/channels/{guildId.Value}/{reminder.ChannelId}/{reminder.MessageId}"));
.AppendSubBulletPointLine(string.Format(Messages.DescriptionActionJumpToMessage,
$"https://discord.com/channels/{guildId.Value}/{reminder.ChannelId}/{reminder.MessageId}"));
}
var embed = new EmbedBuilder().WithSmallTitle(
@ -120,7 +126,7 @@ public class RemindCommandGroup : CommandGroup
[UsedImplicitly]
public async Task<Result> ExecuteReminderAsync(
[Description("After what period of time mention the reminder")]
TimeSpan @in,
string @in,
[Description("Reminder text")] [MaxLength(512)]
string text)
{
@ -129,6 +135,12 @@ public class RemindCommandGroup : CommandGroup
return new ArgumentInvalidError(nameof(_context), "Unable to retrieve necessary IDs from command context");
}
var botResult = await _userApi.GetCurrentUserAsync(CancellationToken);
if (!botResult.IsDefined(out var bot))
{
return Result.FromError(botResult);
}
var executorResult = await _userApi.GetUserAsync(executorId, CancellationToken);
if (!executorResult.IsDefined(out var executor))
{
@ -138,12 +150,34 @@ public class RemindCommandGroup : CommandGroup
var data = await _guildData.GetData(guildId, CancellationToken);
Messages.Culture = GuildSettings.Language.Get(data.Settings);
return await AddReminderAsync(@in, text, data, channelId, executor, CancellationToken);
return await AddReminderAsync(@in, text, data, channelId, bot, executor, CancellationToken);
}
private async Task<Result> AddReminderAsync(TimeSpan @in, string text, GuildData data,
Snowflake channelId, IUser executor, CancellationToken ct = default)
private async Task<Result> AddReminderAsync(string strIn, string text, GuildData data,
Snowflake channelId, IUser bot, IUser executor, CancellationToken ct = default)
{
if (strIn.StartsWith('-'))
{
var failedEmbed = new EmbedBuilder()
.WithSmallTitle(Messages.ReminderNegativeTimeSpan, bot)
.WithColour(ColorsList.Red)
.Build();
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: ct);
}
var parser = new TimeSpanParser();
var parseResult = await parser.TryParseAsync(strIn, ct);
if (!parseResult.IsDefined(out var @in))
{
var failedEmbed = new EmbedBuilder()
.WithSmallTitle(Messages.ReminderInvalidTimeSpan, bot)
.WithColour(ColorsList.Red)
.Build();
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct: ct);
}
var memberData = data.GetOrCreateMemberData(executor.ID);
var remindAt = DateTimeOffset.UtcNow.Add(@in);
var responseResult = await _interactionApi.GetOriginalInteractionResponseAsync(_context.Interaction.ApplicationID, _context.Interaction.Token, ct);

16
src/Messages.Designer.cs generated
View file

@ -1036,5 +1036,21 @@ namespace Octobot {
return ResourceManager.GetString("ButtonReportIssue", resourceCulture);
}
}
internal static string ReminderInvalidTimeSpan
{
get
{
return ResourceManager.GetString("ReminderInvalidTimeSpan", resourceCulture);
}
}
internal static string ReminderNegativeTimeSpan
{
get
{
return ResourceManager.GetString("ReminderNegativeTimeSpan", resourceCulture);
}
}
}
}