StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add member cache; handle all role changes with RoleManagerPlugin; exit gracefully

Browse source
This commit is contained in:
Dragory 2023-05-07 17:56:55 +03:00
parent fd60a09947
commit fa50110766
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
48 changed files with 755 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,12 @@
import { GuildMember } from "discord.js";
import { GuildPluginData } from "knub";
import { MuteTypes } from "../../../data/MuteTypes";
import { Mute } from "../../../data/entities/Mute";
import { clearExpiringMute } from "../../../data/loops/expiringMutesLoop";
import { MuteTypes } from "../../../data/MuteTypes";
import { resolveMember, verboseUserMention } from "../../../utils";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
import { LogsPlugin } from "../../Logs/LogsPlugin";
import { RoleManagerPlugin } from "../../RoleManager/RoleManagerPlugin";
import { MutesPluginType } from "../types";
export async function clearMute(
@ -23,15 +24,16 @@ export async function clearMute(
if (member) {
const lock = await pluginData.locks.acquire(memberRolesLock(member));
const roleManagerPlugin = pluginData.getPlugin(RoleManagerPlugin);
try {
const defaultMuteRole = pluginData.config.get().mute_role;
if (mute) {
const muteRole = mute.mute_role || pluginData.config.get().mute_role;
const muteRoleId = mute.mute_role || pluginData.config.get().mute_role;
if (mute.type === MuteTypes.Role) {
if (muteRole) {
await member.roles.remove(muteRole);
if (muteRoleId) {
roleManagerPlugin.removePriorityRole(member.id, muteRoleId);
}
} else {
await member.timeout(null);
@ -39,19 +41,18 @@ export async function clearMute(
if (mute.roles_to_restore) {
const guildRoles = pluginData.guild.roles.cache;
const newRoles = [...member.roles.cache.keys()].filter((roleId) => roleId !== muteRole);
for (const toRestore of mute?.roles_to_restore) {
if (guildRoles.has(toRestore) && toRestore !== muteRole && !newRoles.includes(toRestore)) {
newRoles.push(toRestore);
const newRoles = [...member.roles.cache.keys()].filter((roleId) => roleId !== muteRoleId);
for (const roleIdToRestore of mute?.roles_to_restore) {
if (guildRoles.has(roleIdToRestore) && roleIdToRestore !== muteRoleId) {
roleManagerPlugin.addRole(member.id, roleIdToRestore);
}
}
await member.roles.set(newRoles);
}
} else {
// Unmuting someone without an active mute -> remove timeouts and/or mute role
const muteRole = pluginData.config.get().mute_role;
if (muteRole && member.roles.cache.has(muteRole)) {
await member.roles.remove(muteRole);
roleManagerPlugin.removePriorityRole(member.id, muteRole);
}
if (member.isCommunicationDisabled()) {
await member.timeout(null);