TeamInklings/OctobotStealth
TeamInklings/OctobotStealth
Archived
1
0
Fork 0
forked from TeamInklings/Octobot
Code Pull requests Wiki Activity Actions

Log guild setting changes to PrivateFeedbackChannel (#79)

Browse source 
This PR makes the bot log guild settings to the Private Feedback
Channel. The functionality was present in pre-Remora Boyfriend, but was
missing afterwards, so I will call this a bug, making this PR a bugfix.

cc @mctaylors - embed design needs review

![image](https://github.com/TeamOctolings/Boyfriend/assets/61277953/5680f0d6-82fc-4c0e-b4f0-815b082997ec)

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-08-04 01:32:38 +05:00 committed by GitHub
parent 84e730838b
commit c9a7fb79ab
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Commands/SettingsCommandGroup.cs
View file

@ -15,6 +15,7 @@ using Remora.Discord.Commands.Contexts;
using Remora.Discord.Commands.Feedback.Services; using Remora.Discord.Commands.Feedback.Services;
using Remora.Discord.Extensions.Embeds; using Remora.Discord.Extensions.Embeds;
using Remora.Discord.Extensions.Formatting; using Remora.Discord.Extensions.Formatting;
using Remora.Rest.Core;
using Remora.Results; using Remora.Results;
namespace Boyfriend.Commands; namespace Boyfriend.Commands;
@ -47,15 +48,17 @@ public class SettingsCommandGroup : CommandGroup
private readonly FeedbackService _feedback; private readonly FeedbackService _feedback;
private readonly GuildDataService _guildData; private readonly GuildDataService _guildData;
private readonly IDiscordRestUserAPI _userApi; private readonly IDiscordRestUserAPI _userApi;
private readonly UtilityService _utility;
public SettingsCommandGroup( public SettingsCommandGroup(
ICommandContext context, GuildDataService guildData, ICommandContext context, GuildDataService guildData,
FeedbackService feedback, IDiscordRestUserAPI userApi) FeedbackService feedback, IDiscordRestUserAPI userApi, UtilityService utility)
{ {
_context = context; _context = context;
_guildData = guildData; _guildData = guildData;
_feedback = feedback; _feedback = feedback;
_userApi = userApi; _userApi = userApi;
_utility = utility;
} }
/// <summary> /// <summary>
@ -156,7 +159,7 @@ public class SettingsCommandGroup : CommandGroup
string setting, string setting,
[Description("Setting value")] string value) [Description("Setting value")] string value)
{ {
if (!_context.TryGetContextIDs(out var guildId, out _, out _)) if (!_context.TryGetContextIDs(out var guildId, out var channelId, out var userId))
{ {
return new ArgumentInvalidError(nameof(_context), "Unable to retrieve necessary IDs from command context"); return new ArgumentInvalidError(nameof(_context), "Unable to retrieve necessary IDs from command context");
} }
@ -167,14 +170,21 @@ public class SettingsCommandGroup : CommandGroup
return Result.FromError(currentUserResult); return Result.FromError(currentUserResult);
} }
var userResult = await _userApi.GetUserAsync(userId, CancellationToken);
if (!userResult.IsDefined(out var user))
{
return Result.FromError(userResult);
}
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 EditSettingAsync(setting, value, data, currentUser, CancellationToken); return await EditSettingAsync(setting, value, data, channelId, user, currentUser, CancellationToken);
} }
private async Task<Result> EditSettingAsync( private async Task<Result> EditSettingAsync(
string setting, string value, GuildData data, IUser currentUser, CancellationToken ct = default) string setting, string value, GuildData data, Snowflake channelId, IUser user, IUser currentUser,
CancellationToken ct = default)
{ {
var option = AllOptions.Single( var option = AllOptions.Single(
o => string.Equals(setting, o.Name, StringComparison.InvariantCultureIgnoreCase)); o => string.Equals(setting, o.Name, StringComparison.InvariantCultureIgnoreCase));
@ -195,9 +205,18 @@ public class SettingsCommandGroup : CommandGroup
builder.Append(Markdown.InlineCode(option.Name)) builder.Append(Markdown.InlineCode(option.Name))
.Append($" {Messages.SettingIsNow} ") .Append($" {Messages.SettingIsNow} ")
.Append(option.Display(data.Settings)); .Append(option.Display(data.Settings));
var title = Messages.SettingSuccessfullyChanged;
var description = builder.ToString();
var embed = new EmbedBuilder().WithSmallTitle(Messages.SettingSuccessfullyChanged, currentUser) var logResult = _utility.LogActionAsync(
.WithDescription(builder.ToString()) data.Settings, channelId, user, title, description, currentUser, ColorsList.Magenta, false, ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(title, currentUser)
.WithDescription(description)
.WithColour(ColorsList.Green) .WithColour(ColorsList.Green)
.Build(); .Build();