diff --git a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts index 4d39e316..ccc60c55 100644 --- a/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts +++ b/backend/src/plugins/Mutes/events/ReapplyActiveMuteOnJoinEvt.ts @@ -1,7 +1,9 @@ import { Snowflake } from "discord.js"; +import moment from "moment-timezone"; import { MuteTypes } from "../../../data/MuteTypes"; import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { LogsPlugin } from "../../Logs/LogsPlugin"; +import { getTimeoutExpiryTime } from "../functions/getTimeoutExpiryTime"; import { mutesEvt } from "../types"; /** @@ -26,6 +28,12 @@ export const ReapplyActiveMuteOnJoinEvt = mutesEvt({ memberRoleLock.unlock(); } } + } else { + if (!member.isCommunicationDisabled()) { + const expiresAt = mute.expires_at ? moment.utc(mute.expires_at).valueOf() : null; + const timeoutExpiresAt = getTimeoutExpiryTime(expiresAt); + await member.disableCommunicationUntil(timeoutExpiresAt); + } } pluginData.getPlugin(LogsPlugin).logMemberMuteRejoin({