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

Tweaks to member role restoration on unmute

Browse source
This commit is contained in:
Dragory 2021-08-20 22:34:31 +03:00
parent be0f9182a0
commit 2451719155
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/src/plugins/Mutes/functions/clearExpiredMutes.ts
View file

@ -18,17 +18,17 @@ export async function clearExpiredMutes(pluginData: GuildPluginData<MutesPluginT
const muteRole = pluginData.config.get().mute_role; const muteRole = pluginData.config.get().mute_role;
if (muteRole) { if (muteRole) {
await member.roles.remove(muteRole as Snowflake); await member.roles.remove(muteRole);
} }
if (mute.roles_to_restore) { if (mute.roles_to_restore) {
const guildRoles = pluginData.guild.roles.cache; const guildRoles = pluginData.guild.roles.cache;
let newRoles = [...member.roles.cache.keys()]; const newRoles = [...member.roles.cache.keys()].filter(roleId => roleId !== muteRole);
newRoles =
muteRole && newRoles.includes(muteRole) ? newRoles.splice(newRoles.indexOf(muteRole), 1) : newRoles;
for (const toRestore of mute.roles_to_restore) { for (const toRestore of mute.roles_to_restore) {
if (guildRoles.has(toRestore as Snowflake) && toRestore !== muteRole) newRoles.push(toRestore); if (guildRoles.has(toRestore) && toRestore !== muteRole && !newRoles.includes(toRestore)) {
newRoles.push(toRestore);
}
} }
await member.roles.set(newRoles as Snowflake[]); await member.roles.set(newRoles);
} }
lock.unlock(); lock.unlock();

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

@ -43,12 +43,13 @@ export async function unmuteUser(
} }
if (existingMute?.roles_to_restore) { if (existingMute?.roles_to_restore) {
const guildRoles = pluginData.guild.roles.cache; const guildRoles = pluginData.guild.roles.cache;
let newRoles = [...member.roles.cache.keys()]; const newRoles = [...member.roles.cache.keys()].filter(roleId => roleId !== muteRole);
newRoles = muteRole && newRoles.includes(muteRole) ? newRoles.splice(newRoles.indexOf(muteRole), 1) : newRoles;
for (const toRestore of existingMute.roles_to_restore) { for (const toRestore of existingMute.roles_to_restore) {
if (guildRoles.has(toRestore as Snowflake) && toRestore !== muteRole) newRoles.push(toRestore); if (guildRoles.has(toRestore) && toRestore !== muteRole && !newRoles.includes(toRestore)) {
newRoles.push(toRestore);
}
} }
await member.roles.set(newRoles as Snowflake[]); await member.roles.set(newRoles);
} }
lock.unlock(); lock.unlock();