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

Finish preliminary rework, ready to test

Browse source
This commit is contained in:
Dark 2021-06-02 04:07:50 +02:00
parent 57893e7f76
commit d0a1beb809
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
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)!);

2
backend/src/plugins/SelfGrantableRoles/commands/RoleHelpCmd.ts
View file

@ -47,6 +47,6 @@ export const RoleHelpCmd = selfGrantableRolesCmd({
color: parseInt("42bff4", 16),
};
msg.channel.createMessage({ embed: helpEmbed });
msg.channel.send({ embed: helpEmbed });
},
});

2
backend/src/plugins/SelfGrantableRoles/commands/RoleRemoveCmd.ts
View file

@ -32,7 +32,7 @@ export const RoleRemoveCmd = selfGrantableRolesCmd({
// Remove the roles
if (rolesToRemove.length) {
const newRoleIds = msg.member.roles.filter(roleId => !roleIdsToRemove.includes(roleId));
const newRoleIds = msg.member.roles.cache.filter(role => !roleIdsToRemove.includes(role.id));
try {
await msg.member.edit({