From 6fab8eca8a5675888f2cbab74422f9211091f0a9 Mon Sep 17 00:00:00 2001 From: mctaylors <95250141+mctaylors@users.noreply.github.com> Date: Thu, 26 Jan 2023 20:57:14 +0300 Subject: [PATCH] Fix removing everyone role while muting Co-authored-by: Octol1ttle --- Commands/MuteCommand.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Commands/MuteCommand.cs b/Commands/MuteCommand.cs index 1d2ebeb..9d373a1 100644 --- a/Commands/MuteCommand.cs +++ b/Commands/MuteCommand.cs @@ -34,10 +34,11 @@ public sealed class MuteCommand : ICommand { var requestOptions = Utils.GetRequestOptions($"({cmd.Context.User}) {reason}"); var role = data.MuteRole; var hasDuration = duration.TotalSeconds > 0; + var memberData = data.MemberData[toMute.Id]; if (role is not null) { if (data.Preferences["RemoveRolesOnMute"] is "true") - await toMute.RemoveRolesAsync(toMute.Roles, requestOptions); + await toMute.RemoveRolesAsync(memberData.Roles, requestOptions); await toMute.AddRoleAsync(role, requestOptions); } else { @@ -54,7 +55,7 @@ public sealed class MuteCommand : ICommand { await toMute.SetTimeOutAsync(duration, requestOptions); } - data.MemberData[toMute.Id].MutedUntil = DateTimeOffset.Now.Add(duration); + memberData.MutedUntil = DateTimeOffset.Now.Add(duration); cmd.ConfigWriteScheduled = true; var feedback = string.Format(Messages.FeedbackMemberMuted, toMute.Mention,