Add mute role support & fix /unmute

totally didn't take 2 painful days

Signed-off-by: Macintosh II <mctaylxrs@outlook.com>

src/Commands/MuteCommandGroup.cs

@@ -101,11 +101,17 @@ public class MuteCommandGroup : CommandGroup
             return await _feedback.SendContextualEmbedResultAsync(embed, CancellationToken);
         }
 
-        return await MuteUserAsync(
+        if (GuildSettings.MuteRole.Get(data.Settings) != 0)
+        {
+            return await RoleMuteUserAsync(
                 target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken);
         }
 
-    private async Task<Result> MuteUserAsync(
+        return await TimeoutUserAsync(
+            target, reason, duration, guildId, data, channelId, user, currentUser, CancellationToken);
+    }
+
+    private async Task<Result> RoleMuteUserAsync(
         IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId,
         IUser user, IUser currentUser, CancellationToken ct = default)
     {
@@ -125,10 +131,75 @@ public class MuteCommandGroup : CommandGroup
             return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
         }
 
+        var until = DateTimeOffset.UtcNow.Add(duration); // >:)
+        var memberData = data.GetOrCreateMemberData(target.ID);
+        memberData.MutedUntil = DateTimeOffset.UtcNow.Add(duration);
+        var assignRoles = new List<Snowflake>
+        {
+            GuildSettings.MuteRole.Get(data.Settings)
+        };
+        var muteResult = await _guildApi.ModifyGuildMemberAsync(
+            guildId, target.ID, roles: assignRoles,
+            reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct);
+        if (!muteResult.IsSuccess)
+        {
+            return Result.FromError(muteResult.Error);
+        }
+
+        var title = string.Format(Messages.UserMuted, target.GetTag());
+        var description = new StringBuilder().AppendLine(string.Format(Messages.DescriptionActionReason, reason))
+            .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);
+    }
+
+    private async Task<Result> TimeoutUserAsync(
+        IUser target, string reason, TimeSpan duration, Snowflake guildId, GuildData data, Snowflake channelId,
+        IUser user, IUser currentUser, CancellationToken ct = default)
+    {
+        if (duration.Days >= 28)
+        {
+            var failedEmbed = new EmbedBuilder().WithSmallTitle(Messages.BotCannotMuteTarget, currentUser)
+                .WithDescription(Messages.DurationRequiredForTimeOuts)
+                .WithColour(ColorsList.Red).Build();
+
+            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);
@@ -211,11 +282,63 @@ public class MuteCommandGroup : CommandGroup
             return await _feedback.SendContextualEmbedResultAsync(embed, CancellationToken);
         }
 
-        return await UnmuteUserAsync(
+        if (data.GetOrCreateMemberData(target.ID).MutedUntil is not null)
+        {
+            return await RemoveMuteRoleUserAsync(
                 target, reason, guildId, data, channelId, user, currentUser, CancellationToken);
         }
 
-    private async Task<Result> UnmuteUserAsync(
+        return await RemoveTimeoutUserAsync(
+            target, reason, guildId, data, channelId, user, currentUser, CancellationToken);
+    }
+
+    private async Task<Result> RemoveMuteRoleUserAsync(
+        IUser target, string reason, Snowflake guildId, GuildData data, Snowflake channelId, IUser user,
+        IUser currentUser, CancellationToken ct = default)
+    {
+        var interactionResult
+            = await _utility.CheckInteractionsAsync(
+                guildId, user.ID, target.ID, "Unmute", 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 memberData = data.GetOrCreateMemberData(target.ID);
+        var unmuteResult = await _guildApi.ModifyGuildMemberAsync(
+            guildId, target.ID, roles: memberData.Roles.ConvertAll(r => r.ToSnowflake()),
+            reason: $"({user.GetTag()}) {reason}".EncodeHeader(), ct: ct);
+        memberData.MutedUntil = null;
+        if (!unmuteResult.IsSuccess)
+        {
+            return Result.FromError(unmuteResult.Error);
+        }
+
+        var title = string.Format(Messages.UserUnmuted, target.GetTag());
+        var description = string.Format(Messages.DescriptionActionReason, reason);
+        var logResult = _utility.LogActionAsync(
+            data.Settings, channelId, user, 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)
+            .WithColour(ColorsList.Green).Build();
+
+        return await _feedback.SendContextualEmbedResultAsync(embed, ct);
+    }
+
+    private async Task<Result> RemoveTimeoutUserAsync(
         IUser target, string reason, Snowflake guildId, GuildData data, Snowflake channelId, IUser user,
         IUser currentUser, CancellationToken ct = default)
     {
@@ -236,7 +359,7 @@ public class MuteCommandGroup : CommandGroup
         }
 
         var unmuteResult = await _guildApi.ModifyGuildMemberAsync(
-            guildId, target.ID, $"({user.GetTag()}) {reason}".EncodeHeader(),
+            guildId, target.ID, reason: $"({user.GetTag()}) {reason}".EncodeHeader(),
             communicationDisabledUntil: null, ct: ct);
         if (!unmuteResult.IsSuccess)
         {

src/Data/MemberData.cs

@@ -1,3 +1,5 @@
+using Remora.Rest.Core;
+
 namespace Boyfriend.Data;
 
 /// <summary>
@@ -13,6 +15,7 @@ public sealed class MemberData
 
     public ulong Id { get; }
     public DateTimeOffset? BannedUntil { get; set; }
+    public DateTimeOffset? MutedUntil { get; set; }
     public List<ulong> Roles { get; set; } = new();
     public List<Reminder> Reminders { get; } = new();
 }

src/Responders/GuildMemberRolesUpdatedResponder.cs

@@ -23,7 +23,11 @@ public class GuildMemberUpdateResponder : IResponder<IGuildMemberUpdate>
     public async Task<Result> RespondAsync(IGuildMemberUpdate gatewayEvent, CancellationToken ct = default)
     {
         var memberData = await _guildData.GetMemberData(gatewayEvent.GuildID, gatewayEvent.User.ID, ct);
+        if (memberData.MutedUntil is null)
+        {
             memberData.Roles = gatewayEvent.Roles.ToList().ConvertAll(r => r.Value);
+        }
+
         return Result.FromSuccess();
     }
 }

src/Services/Update/MemberUpdateService.cs

@@ -91,6 +91,19 @@ public sealed partial class MemberUpdateService : BackgroundService
             return unbanResult;
         }
 
+        if (DateTimeOffset.UtcNow > data.MutedUntil)
+        {
+            var unmuteResult = await _guildApi.ModifyGuildMemberAsync(
+                guildId, id, roles: data.Roles.ConvertAll(r => r.ToSnowflake()),
+                reason: Messages.PunishmentExpired.EncodeHeader(), ct: ct);
+            if (unmuteResult.IsSuccess)
+            {
+                data.MutedUntil = null;
+            }
+
+            return unmuteResult;
+        }
+
         if (defaultRole.Value is not 0 && !data.Roles.Contains(defaultRole.Value))
         {
             var addResult = await _guildApi.AddGuildMemberRoleAsync(