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

resolved all requested changes finally №2

Browse source
This commit is contained in:
neroduckale 2023-12-11 20:29:53 +05:00
parent 9c3144a42e
commit 71ec6d003c
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 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Commands/RemindCommandGroup.cs
View file

@ -26,22 +26,20 @@ namespace Octobot.Commands;
[UsedImplicitly] [UsedImplicitly]
public class RemindCommandGroup : CommandGroup public class RemindCommandGroup : CommandGroup
{ {
private readonly ICommandContext _context; private readonly IInteractionCommandContext _context;
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;
private readonly IDiscordRestInteractionAPI _interactionApi; private readonly IDiscordRestInteractionAPI _interactionApi;
public RemindCommandGroup( public RemindCommandGroup(
ICommandContext context, GuildDataService guildData, IFeedbackService feedback, IInteractionCommandContext context, GuildDataService guildData, IFeedbackService feedback,
IDiscordRestUserAPI userApi, IInteractionCommandContext interactionContext, IDiscordRestInteractionAPI interactionApi) IDiscordRestUserAPI userApi, 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,12 +136,10 @@ 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);
var interactionToken = _context.Interaction.Token;
var applicationId = _context.Interaction.ApplicationID;
return await AddReminderAsync(@in, text, data, channelId, executor, interactionToken, applicationId, CancellationToken); return await AddReminderAsync(@in, text, data, channelId, executor, interactionToken, applicationId, CancellationToken);
} }
@ -157,6 +153,21 @@ public class RemindCommandGroup : CommandGroup
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);
if (!responseResult.IsDefined(out var response))
{
return (Result)responseResult;
}
var interactionValue = response.ID;
memberData.Reminders.Add(
new Reminder
{
At = remindAt,
ChannelId = channelId.Value,
Text = text,
MessageId = interactionValue.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())
@ -169,22 +180,6 @@ public class RemindCommandGroup : CommandGroup
return (Result)messageResult; return (Result)messageResult;
} }
var a = await _interactionApi.GetOriginalInteractionResponseAsync(applicationId, interactionToken, ct);
if (!a.IsDefined(out var interaction))
{
return (Result)a;
}
var interactionValue = interaction.Interaction.Value.ID;
memberData.Reminders.Add(
new Reminder
{
At = remindAt,
ChannelId = channelId.Value,
Text = text,
MessageId = interactionValue.Value
});
return (Result)messageResult; return (Result)messageResult;
} }

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

@ -232,7 +232,7 @@ public sealed partial class MemberUpdateService : BackgroundService
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(builder.ToString())) .WithDescription(builder.ToString())
.WithColour(ColorsList.Magenta) .WithColour(ColorsList.Magenta)
.Build(); .Build();