Cynosphere/HiddenPhox
Cynosphere/HiddenPhox
1
2
Fork 0
Code Projects Releases Packages Wiki Activity

roleme: fix missing filters

Browse source
This commit is contained in:
Cynthia Foxwell 2023-05-12 16:20:35 -06:00
parent 9f6d2e95ed
commit 373ad3e604
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/modules/roleme.js
View file

@ -125,10 +125,13 @@ roleme.callback = async function (msg, line, args) {
return "I do not have `Manage Roles` permission."; return "I do not have `Manage Roles` permission.";
} }
const role = await lookupRole(msg, argStr); const roles = await getRoles(msg.guildID);
const role = await lookupRole(msg, argStr, (role) =>
roles.includes(role.id)
);
if (role === "No results") return role; if (role === "No results") return role;
const roles = await getRoles(msg.guildID);
if (!roles.includes(role.id)) { if (!roles.includes(role.id)) {
return "Role not in assignable roles."; return "Role not in assignable roles.";
} else { } else {
@ -161,10 +164,13 @@ roleme.callback = async function (msg, line, args) {
return "I do not have `Manage Roles` permission."; return "I do not have `Manage Roles` permission.";
} }
const role = await lookupRole(msg, argStr); const roles = await getRoles(msg.guildID);
const role = await lookupRole(msg, argStr, (role) =>
roles.includes(role.id)
);
if (role === "No results") return role; if (role === "No results") return role;
const roles = await getRoles(msg.guildID);
if (!roles.includes(role.id)) { if (!roles.includes(role.id)) {
return "Role not in assignable roles."; return "Role not in assignable roles.";
} else if (msg.member.roles.includes(role.id)) { } else if (msg.member.roles.includes(role.id)) {
@ -179,10 +185,15 @@ roleme.callback = async function (msg, line, args) {
return "I do not have `Manage Roles` permission."; return "I do not have `Manage Roles` permission.";
} }
const role = await lookupRole(msg, argStr); const roles = await getRoles(msg.guildID);
const role = await lookupRole(
msg,
argStr,
(role) => roles.includes(role.id) && msg.member.roles.includes(role.id)
);
if (role === "No results") return role; if (role === "No results") return role;
const roles = await getRoles(msg.guildID);
if (!roles.includes(role.id)) { if (!roles.includes(role.id)) {
return "Role not in assignable roles."; return "Role not in assignable roles.";
} else if (!msg.member.roles.includes(role.id)) { } else if (!msg.member.roles.includes(role.id)) {
@ -207,10 +218,15 @@ roleme.callback = async function (msg, line, args) {
return "I do not have `Manage Roles` permission."; return "I do not have `Manage Roles` permission.";
} }
const role = await lookupRole(msg, (subcommand + " " + argStr).trim()); const roles = await getRoles(msg.guildID);
const role = await lookupRole(
msg,
(subcommand + " " + argStr).trim(),
(role) => roles.includes(role.id)
);
if (role === "No results") return role; if (role === "No results") return role;
const roles = await getRoles(msg.guildID);
if (!roles.includes(role.id)) return "Role not in assignable roles."; if (!roles.includes(role.id)) return "Role not in assignable roles.";
if (msg.member.roles.includes(role.id)) { if (msg.member.roles.includes(role.id)) {