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

Finish preliminary rework, ready to test

Browse source
This commit is contained in:
Dark 2021-06-02 04:07:50 +02:00
parent 293a850075
commit c99e745f89
177 changed files with 854 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/plugins/SelfGrantableRoles/commands/RoleAddCmd.ts
View file

@ -7,6 +7,7 @@ import { normalizeRoleNames } from "../util/normalizeRoleNames";
import { findMatchingRoles } from "../util/findMatchingRoles";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
import { Role } from "discord.js";
export const RoleAddCmd = selfGrantableRolesCmd({
trigger: ["role", "role add"],
@ -49,7 +50,7 @@ export const RoleAddCmd = selfGrantableRolesCmd({
}
// Grant the roles
const newRoleIds = new Set([...rolesToAdd.keys(), ...msg.member.roles]);
const newRoleIds = new Set([...rolesToAdd.keys(), ...msg.member.roles.cache.keys()]);
// Remove extra roles (max_roles) for each entry
const skipped: Set<Role> = new Set();
@ -68,7 +69,7 @@ export const RoleAddCmd = selfGrantableRolesCmd({
newRoleIds.delete(roleId);
rolesToAdd.delete(roleId);
if (msg.member.roles.includes(roleId)) {
if (msg.member.roles.cache.has(roleId)) {
removed.add(pluginData.guild.roles.cache.get(roleId)!);
} else {
skipped.add(pluginData.guild.roles.cache.get(roleId)!);