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

resolve all requested changes finally

Browse source
This commit is contained in:
neroduckale 2023-12-11 19:29:36 +05:00
parent a8c7d1d965
commit 9c3144a42e
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
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Commands/RemindCommandGroup.cs
View file

@ -30,18 +30,18 @@ public class RemindCommandGroup : CommandGroup
private readonly IFeedbackService _feedback; private readonly IFeedbackService _feedback;
private readonly GuildDataService _guildData; private readonly GuildDataService _guildData;
private readonly IDiscordRestUserAPI _userApi; private readonly IDiscordRestUserAPI _userApi;
private readonly IInteractionCommandContext _interactionContext;
// ReSharper disable once NotAccessedField.Local
private readonly IDiscordRestInteractionAPI _interactionApi; private readonly IDiscordRestInteractionAPI _interactionApi;
public RemindCommandGroup( public RemindCommandGroup(
ICommandContext context, GuildDataService guildData, IFeedbackService feedback, ICommandContext context, GuildDataService guildData, IFeedbackService feedback,
IDiscordRestUserAPI userApi, IDiscordRestInteractionAPI interactionApi) IDiscordRestUserAPI userApi, IInteractionCommandContext interactionContext, IDiscordRestInteractionAPI interactionApi)
{ {
_context = context; _context = context;
_guildData = guildData; _guildData = guildData;
_feedback = feedback; _feedback = feedback;
_userApi = userApi; _userApi = userApi;
_interactionContext = interactionContext;
_interactionApi = interactionApi; _interactionApi = interactionApi;
} }
@ -138,15 +138,17 @@ public class RemindCommandGroup : CommandGroup
return Result.FromError(executorResult); return Result.FromError(executorResult);
} }
var interactionToken = _interactionContext.Interaction.Token;
var applicationId = _interactionContext.Interaction.ApplicationID;
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 AddReminderAsync(@in, text, data, channelId, executor, CancellationToken); return await AddReminderAsync(@in, text, data, channelId, executor, interactionToken, applicationId, CancellationToken);
} }
private async Task<Result> AddReminderAsync( private async Task<Result> AddReminderAsync(TimeSpan @in, string text, GuildData data,
TimeSpan @in, string text, GuildData data, Snowflake channelId, IUser executor, string interactionToken, Snowflake applicationId, CancellationToken ct = default)
Snowflake channelId, IUser executor, CancellationToken ct = default)
{ {
var remindAt = DateTimeOffset.UtcNow.Add(@in); var remindAt = DateTimeOffset.UtcNow.Add(@in);
var memberData = data.GetOrCreateMemberData(executor.ID); var memberData = data.GetOrCreateMemberData(executor.ID);
@ -162,20 +164,25 @@ public class RemindCommandGroup : CommandGroup
.WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count + 1)) .WithFooter(string.Format(Messages.ReminderPosition, memberData.Reminders.Count + 1))
.Build(); .Build();
var messageResult = await _feedback.SendContextualEmbedAsync(embed.Entity, ct: ct); var messageResult = await _feedback.SendContextualEmbedAsync(embed.Entity, ct: ct);
if (!messageResult.IsDefined(out var message)) if (!messageResult.IsDefined(out _))
{ {
return (Result)messageResult; return (Result)messageResult;
} }
// var a = await _interactionApi.GetOriginalInteractionResponseAsync(message.Application.Value.ID.Value, "", ct); var a = await _interactionApi.GetOriginalInteractionResponseAsync(applicationId, interactionToken, ct);
//TODO if (!a.IsDefined(out var interaction))
{
return (Result)a;
}
var interactionValue = interaction.Interaction.Value.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 = message.ID.Value MessageId = interactionValue.Value
}); });
return (Result)messageResult; return (Result)messageResult;

8
src/Services/Update/MemberUpdateService.cs
View file

@ -1,3 +1,4 @@
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -225,10 +226,13 @@ public sealed partial class MemberUpdateService : BackgroundService
return Result.FromSuccess(); return Result.FromSuccess();
} }
var builder = new StringBuilder()
.AppendBulletPointLine(string.Format(Messages.DescriptionReminder, Markdown.InlineCode(reminder.Text)))
.AppendBulletPointLine(string.Format(Messages.DescriptionActionJumpToMessage, $"https://discord.com/channels/{guildId.Value}/{reminder.ChannelId}/{reminder.MessageId}"));
var embed = new EmbedBuilder().WithSmallTitle( var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.Reminder, user.GetTag()), user) string.Format(Messages.Reminder, user.GetTag()), user)
.WithDescription(string.Format(Messages.DescriptionReminder, Markdown.InlineCode(reminder.Text)) + .WithDescription(string.Format(builder.ToString()))
$" (https://discord.com/channels/{guildId.Value}/{reminder.ChannelId}/{reminder.MessageId})")
.WithColour(ColorsList.Magenta) .WithColour(ColorsList.Magenta)
.Build(); .Build();