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

general fixes I can't categorize

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-07-20 11:54:07 +05:00
parent 685688bbe8
commit 2edca8e51d
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
4 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Commands/BanCommandGroup.cs
View file

@ -152,7 +152,9 @@ public class BanCommandGroup : CommandGroup {
title, target)
.WithColour(ColorsList.Green).Build();
_utility.LogActionAsync(cfg, channelId, title, target, description, user, CancellationToken);
var logResult = _utility.LogActionAsync(cfg, channelId, user, title, description, target, CancellationToken);
if (!logResult.IsSuccess)
return Result.FromError(logResult.Error);
return await _feedbackService.SendContextualEmbedResultAsync(embed, CancellationToken);
}
@ -222,7 +224,7 @@ public class BanCommandGroup : CommandGroup {
var title = string.Format(Messages.UserUnbanned, target.GetTag());
var description = string.Format(Messages.DescriptionActionReason, reason);
var logResult = _utility.LogActionAsync(cfg, channelId, title, target, description, user, CancellationToken);
var logResult = _utility.LogActionAsync(cfg, channelId, user, title, description, target, CancellationToken);
if (!logResult.IsSuccess)
return Result.FromError(logResult.Error);

7
src/Data/Options/LanguageOption.cs
View file

@ -27,9 +27,8 @@ public class LanguageOption : Option<CultureInfo> {
/// <inheritdoc />
public override Result Set(JsonNode settings, string from) {
if (!CultureInfoCache.ContainsKey(from.ToLowerInvariant()))
return Result.FromError(new ArgumentInvalidError(nameof(from), Messages.LanguageNotSupported));
return base.Set(settings, from.ToLowerInvariant());
return CultureInfoCache.ContainsKey(from.ToLowerInvariant())
? base.Set(settings, from.ToLowerInvariant())
: Result.FromError(new ArgumentInvalidError(nameof(from), Messages.LanguageNotSupported));
}
}

14
src/Responders/MessageDeletedResponder.cs
View file

@ -46,15 +46,13 @@ public class MessageDeletedResponder : IResponder<IMessageDelete> {
if (!auditLogResult.IsDefined(out var auditLogPage)) return Result.FromError(auditLogResult);
var auditLog = auditLogPage.AuditLogEntries.Single();
if (!auditLog.Options.IsDefined(out var options))
return Result.FromError(new ArgumentNullError(nameof(auditLog.Options)));
var user = message.Author;
if (options.ChannelID == gatewayEvent.ChannelID
&& DateTimeOffset.UtcNow.Subtract(auditLog.ID.Timestamp).TotalSeconds <= 2) {
var userResult = await _userApi.GetUserAsync(auditLog.UserID!.Value, ct);
if (!userResult.IsDefined(out user)) return Result.FromError(userResult);
}
var userResult = Result<IUser>.FromSuccess(message.Author);
if (auditLog.Options.Value.ChannelID == gatewayEvent.ChannelID
&& DateTimeOffset.UtcNow.Subtract(auditLog.ID.Timestamp).TotalSeconds <= 2)
userResult = await _userApi.GetUserAsync(auditLog.UserID!.Value, ct);
if (!userResult.IsDefined(out var user)) return Result.FromError(userResult);
Messages.Culture = GuildSettings.Language.Get(cfg);

10
src/Services/UtilityService.cs
View file

@ -154,15 +154,15 @@ public class UtilityService : IHostedService {
/// </summary>
/// <param name="cfg">The guild configuration.</param>
/// <param name="channelId">The ID of the channel where the action was executed.</param>
/// <param name="title">The title for the embed.</param>
/// <param name="avatar">The user whose avatar will be displayed next to the <paramref name="title" /> of the embed.</param>
/// <param name="description">The description of the embed.</param>
/// <param name="user">The user who performed the action.</param>
/// <param name="title">The title for the embed.</param>
/// <param name="description">The description of the embed.</param>
/// <param name="avatar">The user whose avatar will be displayed next to the <paramref name="title" /> of the embed.</param>
/// <param name="ct">The cancellation token for this operation.</param>
/// <returns></returns>
public Result LogActionAsync(
JsonNode cfg, Snowflake channelId, string title, IUser avatar, string description,
IUser user, CancellationToken ct = default) {
JsonNode cfg, Snowflake channelId, IUser user, string title, string description, IUser avatar,
CancellationToken ct = default) {
var publicChannel = GuildSettings.PublicFeedbackChannel.Get(cfg);
var privateChannel = GuildSettings.PrivateFeedbackChannel.Get(cfg);
if (GuildSettings.PublicFeedbackChannel.Get(cfg).EmptyOrEqualTo(channelId)