From 017ef5674a2a2ef908c1afe86b1edaca6a92888f Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Sat, 1 Apr 2023 20:15:03 +0300
Subject: [PATCH] fix: isCommunicationDisabled()

---
 backend/src/plugins/ModActions/commands/UnmuteCmd.ts | 2 +-
 backend/src/plugins/Mutes/functions/clearMute.ts     | 2 +-
 backend/src/plugins/Mutes/functions/unmuteUser.ts    | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/backend/src/plugins/ModActions/commands/UnmuteCmd.ts b/backend/src/plugins/ModActions/commands/UnmuteCmd.ts
index 191ab383..55c84631 100644
--- a/backend/src/plugins/ModActions/commands/UnmuteCmd.ts
+++ b/backend/src/plugins/ModActions/commands/UnmuteCmd.ts
@@ -47,7 +47,7 @@ export const UnmuteCmd = modActionsCmd({
     if (
       !(await pluginData.state.mutes.isMuted(user.id)) &&
       !hasMuteRole &&
-      !memberToUnmute?.communicationDisabledUntilTimestamp
+      !memberToUnmute?.isCommunicationDisabled()
     ) {
       sendErrorMessage(pluginData, msg.channel, "Cannot unmute: member is not muted");
       return;
diff --git a/backend/src/plugins/Mutes/functions/clearMute.ts b/backend/src/plugins/Mutes/functions/clearMute.ts
index ba6577bc..2fe99576 100644
--- a/backend/src/plugins/Mutes/functions/clearMute.ts
+++ b/backend/src/plugins/Mutes/functions/clearMute.ts
@@ -53,7 +53,7 @@ export async function clearMute(
         if (muteRole && member.roles.cache.has(muteRole)) {
           await member.roles.remove(muteRole);
         }
-        if (member.communicationDisabledUntilTimestamp) {
+        if (member.isCommunicationDisabled()) {
           await member.timeout(null);
         }
       }
diff --git a/backend/src/plugins/Mutes/functions/unmuteUser.ts b/backend/src/plugins/Mutes/functions/unmuteUser.ts
index baee29c6..5fa6f90a 100644
--- a/backend/src/plugins/Mutes/functions/unmuteUser.ts
+++ b/backend/src/plugins/Mutes/functions/unmuteUser.ts
@@ -26,12 +26,7 @@ export async function unmuteUser(
   const member = await resolveMember(pluginData.client, pluginData.guild, userId, true); // Grab the fresh member so we don't have stale role info
   const modId = caseArgs.modId || pluginData.client.user!.id;
 
-  if (
-    !existingMute &&
-    member &&
-    !memberHasMutedRole(pluginData, member) &&
-    !member?.communicationDisabledUntilTimestamp
-  ) {
+  if (!existingMute && member && !memberHasMutedRole(pluginData, member) && !member?.isCommunicationDisabled()) {
     return null;
   }