From 9771aefb6fcd93228c173ee531802423d4e47810 Mon Sep 17 00:00:00 2001 From: Macintosh II Date: Tue, 3 Oct 2023 16:50:11 +0300 Subject: [PATCH] Use one common method in /mute Signed-off-by: Macintosh II --- src/Commands/MuteCommandGroup.cs | 103 ++++++++++++------------------- 1 file changed, 41 insertions(+), 62 deletions(-) diff --git a/src/Commands/MuteCommandGroup.cs b/src/Commands/MuteCommandGroup.cs index d558ba2..59e6615 100644 --- a/src/Commands/MuteCommandGroup.cs +++ b/src/Commands/MuteCommandGroup.cs @@ -101,17 +101,11 @@ public class MuteCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, CancellationToken); } - if (!GuildSettings.MuteRole.Get(data.Settings).Empty()) - { - return await RoleMuteUserAsync( - target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken); - } - - return await TimeoutUserAsync( + return await MuteUserAsync( target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken); } - private async Task RoleMuteUserAsync( + private async Task MuteUserAsync( IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId, IUser user, IUser currentUser, CancellationToken ct = default) { @@ -132,23 +126,28 @@ public class MuteCommandGroup : CommandGroup } var until = DateTimeOffset.UtcNow.Add(duration); // >:) + var memberData = data.GetOrCreateMemberData(target.ID); - memberData.MutedUntil = until; - var assignRoles = new List + var muteRole = GuildSettings.MuteRole.Get(data.Settings); + + if (!muteRole.Empty()) { - GuildSettings.MuteRole.Get(data.Settings) - }; - if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings)) - { - assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake())); + var muteRoleAsync = + await RoleMuteUserAsync(target, reason, guildId, data, memberData, user, until, muteRole, CancellationToken); + if (!muteRoleAsync.IsSuccess) + { + return Result.FromError(muteRoleAsync.Error); + } } - var muteResult = await _guildApi.ModifyGuildMemberAsync( - guildId, target.ID, roles: assignRoles, - reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct); - if (!muteResult.IsSuccess) + if (muteRole.Empty()) { - return Result.FromError(muteResult.Error); + var timeoutResult = + await TimeoutUserAsync(target, reason, duration, guildId, user, currentUser, until, CancellationToken); + if (!timeoutResult.IsSuccess) + { + return Result.FromError(timeoutResult.Error); + } } var title = string.Format(Messages.UserMuted, target.GetTag()); @@ -170,9 +169,28 @@ public class MuteCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(embed, ct); } + private async Task RoleMuteUserAsync( + IUser target, string reason, Snowflake guildId, GuildData data, MemberData memberData, + IUser user, DateTimeOffset until, Snowflake muteRole, CancellationToken ct = default) + { + memberData.MutedUntil = until; + + var assignRoles = new List { muteRole }; + + if (!GuildSettings.RemoveRolesOnMute.Get(data.Settings)) + { + assignRoles.AddRange(memberData.Roles.ConvertAll(r => r.ToSnowflake())); + } + + var muteResult = await _guildApi.ModifyGuildMemberAsync( + guildId, target.ID, roles: assignRoles, + reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct); + return !muteResult.IsSuccess ? Result.FromError(muteResult.Error) : Result.FromSuccess(); + } + private async Task TimeoutUserAsync( - IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId, - IUser user, IUser currentUser, CancellationToken ct = default) + IUser target, string reason, TimeSpan duration, Snowflake guildId, + IUser user, IUser currentUser, DateTimeOffset until, CancellationToken ct = default) { if (duration.TotalDays >= 28) { @@ -183,49 +201,10 @@ public class MuteCommandGroup : CommandGroup return await _feedback.SendContextualEmbedResultAsync(failedEmbed, CancellationToken); } - var interactionResult - = await _utility.CheckInteractionsAsync( - guildId, user.ID, target.ID, "Mute", ct); - if (!interactionResult.IsSuccess) - { - return Result.FromError(interactionResult); - } - - if (interactionResult.Entity is not null) - { - var failedEmbed = new EmbedBuilder().WithSmallTitle(interactionResult.Entity, currentUser) - .WithColour(ColorsList.Red).Build(); - - return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct); - } - - var until = DateTimeOffset.UtcNow.Add(duration); // >:) var muteResult = await _guildApi.ModifyGuildMemberAsync( guildId, target.ID, reason: $"({user.GetTag()}) {reason}".EncodeHeader(), communicationDisabledUntil: until, ct: ct); - - if (!muteResult.IsSuccess) - { - return Result.FromError(muteResult.Error); - } - - var title = string.Format(Messages.UserMuted, target.GetTag()); - var description = new StringBuilder().Append("- ").AppendLine(string.Format(Messages.DescriptionActionReason, reason)) - .Append("- ").Append(string.Format( - Messages.DescriptionActionExpiresAt, Markdown.Timestamp(until))).ToString(); - - var logResult = _utility.LogActionAsync( - data.Settings, channelId, user, 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) - .WithColour(ColorsList.Green).Build(); - - return await _feedback.SendContextualEmbedResultAsync(embed, ct); + return !muteResult.IsSuccess ? Result.FromError(muteResult.Error) : Result.FromSuccess(); } ///