StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-15 05:41:51 +00:00
Code Releases Activity

fix: isCommunicationDisabled()

Browse source
This commit is contained in:
Dragory 2023-04-01 20:15:03 +03:00
parent 7c8573c6d5
commit 017ef5674a
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/ModActions/commands/UnmuteCmd.ts
View file

@ -47,7 +47,7 @@ export const UnmuteCmd = modActionsCmd({
if ( if (
!(await pluginData.state.mutes.isMuted(user.id)) && !(await pluginData.state.mutes.isMuted(user.id)) &&
!hasMuteRole && !hasMuteRole &&
!memberToUnmute?.communicationDisabledUntilTimestamp !memberToUnmute?.isCommunicationDisabled()
) { ) {
sendErrorMessage(pluginData, msg.channel, "Cannot unmute: member is not muted"); sendErrorMessage(pluginData, msg.channel, "Cannot unmute: member is not muted");
return; return;

2
backend/src/plugins/Mutes/functions/clearMute.ts
View file

@ -53,7 +53,7 @@ export async function clearMute(
if (muteRole && member.roles.cache.has(muteRole)) { if (muteRole && member.roles.cache.has(muteRole)) {
await member.roles.remove(muteRole); await member.roles.remove(muteRole);
} }
if (member.communicationDisabledUntilTimestamp) { if (member.isCommunicationDisabled()) {
await member.timeout(null); await member.timeout(null);
} }
} }

7
backend/src/plugins/Mutes/functions/unmuteUser.ts
View file

@ -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 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; const modId = caseArgs.modId || pluginData.client.user!.id;
if ( if (!existingMute && member && !memberHasMutedRole(pluginData, member) && !member?.isCommunicationDisabled()) {
!existingMute &&
member &&
!memberHasMutedRole(pluginData, member) &&
!member?.communicationDisabledUntilTimestamp
) {
return null; return null;
} }