Fix error
This commit is contained in:
parent
3dbe27a1cb
commit
9917c4c06c
@ -4,6 +4,7 @@ const Collector = require(path.join(__dirname, "../functions/messageCollector"))
|
|||||||
const EditCollector = require(path.join(__dirname, "../functions/messageEdit"));
|
const EditCollector = require(path.join(__dirname, "../functions/messageEdit"));
|
||||||
const CommandDB = require(path.join(__dirname, "../models/commands"));
|
const CommandDB = require(path.join(__dirname, "../models/commands"));
|
||||||
const { isJson } = require(path.join(__dirname, "../functions/randomStr"));
|
const { isJson } = require(path.join(__dirname, "../functions/randomStr"));
|
||||||
|
const botConfig = require(path.join(__dirname, "../botConfig.json"));
|
||||||
|
|
||||||
module.exports = async (client, message) => {
|
module.exports = async (client, message) => {
|
||||||
// Early return checks
|
// Early return checks
|
||||||
@ -79,14 +80,14 @@ module.exports = async (client, message) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if user has required roles
|
// Check if user has required roles
|
||||||
const hasRequiredRole = commandfile.config.roles && message.member.roles && client.botConfig.roles && client.botConfig.roles.length > 0 ?
|
const hasRequiredRole = commandfile.config.roles && message.member.roles && botConfig.roles[0] ?
|
||||||
message.member.roles.some(role => {
|
message.member.roles.some(role => {
|
||||||
const whitelistedRoles = Object.values(client.botConfig.roles[0] || {});
|
const requiredRoleIds = commandfile.config.roles.map(roleName => botConfig.roles[0][roleName.toLowerCase()]);
|
||||||
return whitelistedRoles.includes(role);
|
return requiredRoleIds.includes(role);
|
||||||
}) : false;
|
}) : false;
|
||||||
|
|
||||||
// Command availability check (skip for DMs)
|
// Command availability check (skip for DMs)
|
||||||
if (!commandfile.config.available && !hasRequiredRole && !client.botConfig.owners.includes(message.authorId)) {
|
if (!commandfile.config.available && !hasRequiredRole && !botConfig.owners.includes(message.authorId)) {
|
||||||
return message.reply({
|
return message.reply({
|
||||||
embeds: [new Embed()
|
embeds: [new Embed()
|
||||||
.setColor("#FF0000")
|
.setColor("#FF0000")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user