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

resolved all requested changes finally №3

Browse source
This commit is contained in:
neroduckale 2023-12-11 20:55:37 +05:00
parent 71ec6d003c
commit 1a699ede2f
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 399E73062E1A3667
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Commands/RemindCommandGroup.cs
View file

@ -138,9 +138,7 @@ 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);
var interactionToken = _context.Interaction.Token; return await AddReminderAsync(@in, text, data, channelId, executor, _context.Interaction.Token, _context.Interaction.ApplicationID, CancellationToken);
var applicationId = _context.Interaction.ApplicationID;
return await AddReminderAsync(@in, text, data, channelId, executor, interactionToken, applicationId, CancellationToken);
} }
private async Task<Result> AddReminderAsync(TimeSpan @in, string text, GuildData data, private async Task<Result> AddReminderAsync(TimeSpan @in, string text, GuildData data,
@ -148,9 +146,8 @@ public class RemindCommandGroup : CommandGroup
{ {
var remindAt = DateTimeOffset.UtcNow.Add(@in); var remindAt = DateTimeOffset.UtcNow.Add(@in);
var memberData = data.GetOrCreateMemberData(executor.ID); var memberData = data.GetOrCreateMemberData(executor.ID);
var builder = new StringBuilder()
var builder = new StringBuilder().AppendBulletPointLine(string.Format( .AppendBulletPointLine(string.Format(Messages.ReminderText, Markdown.InlineCode(text)))
Messages.ReminderText, Markdown.InlineCode(text)))
.AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt))); .AppendBulletPoint(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
var responseResult = await _interactionApi.GetOriginalInteractionResponseAsync(applicationId, interactionToken, ct); var responseResult = await _interactionApi.GetOriginalInteractionResponseAsync(applicationId, interactionToken, ct);
@ -159,28 +156,21 @@ public class RemindCommandGroup : CommandGroup
return (Result)responseResult; return (Result)responseResult;
} }
var interactionValue = response.ID;
memberData.Reminders.Add( memberData.Reminders.Add(
new Reminder new Reminder
{ {
At = remindAt, At = remindAt,
ChannelId = channelId.Value, ChannelId = channelId.Value,
Text = text, Text = text,
MessageId = interactionValue.Value MessageId = response.ID.Value
}); });
var embed = new EmbedBuilder().WithSmallTitle( var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.ReminderCreated, executor.GetTag()), executor) string.Format(Messages.ReminderCreated, executor.GetTag()), executor)
.WithDescription(builder.ToString()) .WithDescription(builder.ToString())
.WithColour(ColorsList.Green) .WithColour(ColorsList.Green)
.WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count + 1)) .WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count))
.Build(); .Build();
var messageResult = await _feedback.SendContextualEmbedAsync(embed.Entity, ct: ct); return await _feedback.SendContextualEmbedResultAsync(embed, ct);
if (!messageResult.IsDefined(out _))
{
return (Result)messageResult;
}
return (Result)messageResult;
} }
/// <summary> /// <summary>