add checks for presence of user/role perms before checking
parent
0633564e6a
commit
9e5c9da6e2
|
@ -16,13 +16,22 @@ export default class {
|
|||
const resolved: Command = this.client.util.resolveCommand(command);
|
||||
if (!resolved) return;
|
||||
if (resolved.guildOnly && !(message.channel instanceof TextChannel)) return;
|
||||
const hasUserPerms: boolean = resolved.permissions.users.includes(message.author.id);
|
||||
let hasUserPerms: boolean;
|
||||
if (resolved.permissions.users) {
|
||||
hasUserPerms = resolved.permissions.users.includes(message.author.id);
|
||||
} else {
|
||||
hasUserPerms = true;
|
||||
}
|
||||
let hasRolePerms: boolean = false;
|
||||
if (resolved.permissions.roles) {
|
||||
for (const role of resolved.permissions.roles) {
|
||||
if (message.member && message.member.roles.includes(role)) {
|
||||
hasRolePerms = true; break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
hasRolePerms = true;
|
||||
}
|
||||
if (!hasRolePerms && !hasUserPerms) return;
|
||||
if (!resolved.enabled) { message.channel.createMessage(`***${this.client.stores.emojis.error} This command has been disabled***`); return; }
|
||||
const args: string[] = noPrefix.slice(1);
|
||||
|
|
Loading…
Reference in New Issue