TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-01-31 00:19:00 +03:00
Code Issues Wiki Activity

Make LogAction return void (#261)

Browse source 
1) the method isn't actually async lulw
2) it always returns success, so might as well just be void

reduces complexity by a bit

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2024-02-06 23:39:20 +05:00 committed by GitHub
parent 58bd439aa7
commit d39303560d
Signed by: GitHub
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Commands/BanCommandGroup.cs
View file

@ -196,12 +196,8 @@ public class BanCommandGroup : CommandGroup
title, target)
.WithColour(ColorsList.Green).Build();
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, target, ColorsList.Red, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
return await _feedback.SendContextualEmbedResultAsync(embed, ct: ct);
}
@ -287,12 +283,9 @@ public class BanCommandGroup : CommandGroup
var title = string.Format(Messages.UserUnbanned, target.GetTag());
var description = new StringBuilder().AppendBulletPoint(string.Format(Messages.DescriptionActionReason, reason));
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description.ToString(), target, ColorsList.Green, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
return await _feedback.SendContextualEmbedResultAsync(embed, ct: ct);
}

6
src/Commands/ClearCommandGroup.cs
View file

@ -136,12 +136,8 @@ public class ClearCommandGroup : CommandGroup
return Result.FromError(deleteResult.Error);
}
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, bot, ColorsList.Red, false, ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(title, bot)
.WithColour(ColorsList.Green).Build();

7
src/Commands/KickCommandGroup.cs
View file

@ -157,12 +157,9 @@ public class KickCommandGroup : CommandGroup
var title = string.Format(Messages.UserKicked, target.GetTag());
var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, target, ColorsList.Red, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.UserKicked, target.GetTag()), target)

13
src/Commands/MuteCommandGroup.cs
View file

@ -153,12 +153,8 @@ public class MuteCommandGroup : CommandGroup
.AppendBulletPoint(string.Format(
Messages.DescriptionActionExpiresAt, Markdown.Timestamp(until))).ToString();
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, target, ColorsList.Red, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.UserMuted, target.GetTag()), target)
@ -339,12 +335,9 @@ public class MuteCommandGroup : CommandGroup
var title = string.Format(Messages.UserUnmuted, target.GetTag());
var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, target, ColorsList.Green, ct: ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.UserUnmuted, target.GetTag()), target)

6
src/Commands/SettingsCommandGroup.cs
View file

@ -218,12 +218,8 @@ public class SettingsCommandGroup : CommandGroup
var title = Messages.SettingSuccessfullyChanged;
var description = builder.ToString();
var logResult = _utility.LogActionAsync(
_utility.LogAction(
data.Settings, channelId, executor, title, description, bot, ColorsList.Magenta, false, ct);
if (!logResult.IsSuccess)
{
return Result.FromError(logResult.Error);
}
var embed = new EmbedBuilder().WithSmallTitle(title, bot)
.WithDescription(description)

6
src/Services/Utility.cs
View file

@ -196,7 +196,7 @@ public sealed class Utility
/// </param>
/// <param name="ct">The cancellation token for this operation.</param>
/// <returns>A result which has succeeded.</returns>
public Result LogActionAsync(
public void LogAction(
JsonNode cfg, Snowflake channelId, IUser user, string title, string description, IUser avatar,
Color color, bool isPublic = true, CancellationToken ct = default)
{
@ -205,7 +205,7 @@ public sealed class Utility
if (GuildSettings.PublicFeedbackChannel.Get(cfg).EmptyOrEqualTo(channelId)
&& GuildSettings.PrivateFeedbackChannel.Get(cfg).EmptyOrEqualTo(channelId))
{
return Result.FromSuccess();
return;
}
var logEmbed = new EmbedBuilder().WithSmallTitle(title, avatar)
@ -230,8 +230,6 @@ public sealed class Utility
privateChannel, embedResult: logEmbed,
ct: ct);
}
return Result.FromSuccess();
}
public async Task<Result<Snowflake>> GetEmergencyFeedbackChannel(IGuild guild, GuildData data, CancellationToken ct)