embee/woomy-v2
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

emoji moved to config

Browse source
This commit is contained in:
Emily 2021-07-15 12:26:42 +10:00
parent c0c1945b2c
commit da570fc40b
19 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

26
bot/commands/Configuration/blocklist.js
View file

@ -39,11 +39,11 @@ module.exports = class {
action = action.toLowerCase();
if (action !== 'add' & action !== 'remove') {
return message.channel.createMessage(`${client.emojis.userError} You didn't specify a valid action. Usage: \`${this.help.usage}\``);
return message.channel.createMessage(`${client.config.emojis.userError} You didn't specify a valid action. Usage: \`${this.help.usage}\``);
}
if (!user) return message.channel.createMessage(
`${client.emojis.userError} You didn't specify a user. Usage: \`${message.prefix + this.help.usage}\``
`${client.config.emojis.userError} You didn't specify a user. Usage: \`${message.prefix + this.help.usage}\``
);
let member;
@ -57,11 +57,11 @@ module.exports = class {
member = await message.channel.guild.searchMembers(user.join(' '), 2);
if (member.length === 0) return message.channel.createMessage(
`${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
`${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
);
if (member.length > 1) return message.channel.createMessage(
`${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.`
`${client.config.emojis.userError} Found more than one user, try refining your search or pinging the user instead.`
);
member = member[0];
@ -72,24 +72,24 @@ module.exports = class {
if (action === 'add') {
if (member.id === message.channel.guild.ownerID) return message.channel.createMessage(
`${client.emojis.userError} You can't block the owner, silly!`
`${client.config.emojis.userError} You can't block the owner, silly!`
);
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
return message.channel.createMessage(`${client.emojis.userError} This user has a higher role than you, you can't add them to the blocklist!`);
return message.channel.createMessage(`${client.config.emojis.userError} This user has a higher role than you, you can't add them to the blocklist!`);
}
if (blocklist.includes(member.id)) return message.channel.createMessage(
`${client.emojis.userError} This user is already on the blocklist, you can't add them twice!`
`${client.config.emojis.userError} This user is already on the blocklist, you can't add them twice!`
);
blocklist.push(member.id);
client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
message.channel.createMessage(`${client.emojis.success} Added \`${member.username}#${member.discriminator}\` to the blocklist.`);
message.channel.createMessage(`${client.config.emojis.success} Added \`${member.username}#${member.discriminator}\` to the blocklist.`);
}).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error);
message.channel.createMessage(`${client.emojis.botError} An error occured while adding this user to the blocklist, please try again! **Error:** ${error}`);
message.channel.createMessage(`${client.config.emojis.botError} An error occured while adding this user to the blocklist, please try again! **Error:** ${error}`);
}) ;
return;
@ -97,20 +97,20 @@ module.exports = class {
if (action === 'remove') {
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
return message.channel.createMessage(`${client.emojis.userError} This user has a higher role than you, you can't remove them to the blocklist!`);
return message.channel.createMessage(`${client.config.emojis.userError} This user has a higher role than you, you can't remove them to the blocklist!`);
}
if (!blocklist.includes(member.id)) return message.channel.createMessage(
`${client.emojis.userError} This user isn't on the blocklist.`
`${client.config.emojis.userError} This user isn't on the blocklist.`
);
blocklist.remove(member.id);
client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
message.channel.createMessage(`${client.emojis.success} Removed \`${member.username}#${member.discriminator}\` from the blocklist.`);
message.channel.createMessage(`${client.config.emojis.success} Removed \`${member.username}#${member.discriminator}\` from the blocklist.`);
}).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error);
message.channel.createMessage(`${client.emojis.botError} An error occured while removing this user from the blocklist, please try again! **Error:** ${error}`);
message.channel.createMessage(`${client.config.emojis.botError} An error occured while removing this user from the blocklist, please try again! **Error:** ${error}`);
}) ;
return;

16
bot/commands/Configuration/disable.js
View file

@ -27,7 +27,7 @@ module.exports = class {
}
if (!args[1]) return message.channel.createMessage(
`${client.emojis.userError} You didn't specify what command/category to disable. Usage: \`${this.help.usage}\``
`${client.config.emojis.userError} You didn't specify what command/category to disable. Usage: \`${this.help.usage}\``
);
if (args[0].toLowerCase() === 'command' || args[0].toLowerCase() === 'cmd') {
@ -42,17 +42,17 @@ module.exports = class {
}
if (!command) return message.channel.createMessage(
`${client.emojis.userError} ${args[1]} isn't a command or an alias, are you sure you spelt it correctly?`
`${client.config.emojis.userError} ${args[1]} isn't a command or an alias, are you sure you spelt it correctly?`
);
if (essential.commands.includes(command.name) || essential.categories.includes(command.category)) {
return message.channel.createMessage(
`${client.emojis.userError} This command is essential and cannot be disabled. Sorry!`
`${client.config.emojis.userError} This command is essential and cannot be disabled. Sorry!`
);
}
if (disabled.includes(command.name)) return message.channel.createMessage(
`${client.emojis.userError} This command is already disabled.`
`${client.config.emojis.userError} This command is already disabled.`
);
disabled.push(command.name);
@ -60,7 +60,7 @@ module.exports = class {
await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
return message.channel.createMessage(
`${client.emojis.success} Added **${args[1]}** to the list of disabled commands for this server.`
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled commands for this server.`
);
}
@ -76,11 +76,11 @@ module.exports = class {
}
if (!command) return message.channel.createMessage(
`${client.emojis.userError} ${args[1]} isn't a category, are you sure you spelt it correctly?`
`${client.config.emojis.userError} ${args[1]} isn't a category, are you sure you spelt it correctly?`
);
if (!disabled.includes(command.name)) return message.channel.createMessage(
`${client.emojis.userError} This category isn't disabled.`
`${client.config.emojis.userError} This category isn't disabled.`
);
disabled.remove(command.name);
@ -88,7 +88,7 @@ module.exports = class {
await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
return message.channel.createMessage(
`${client.emojis.success} Added **${args[1]}** to the list of disabled category for this server!`
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled category for this server!`
);
}
}

2
bot/commands/Configuration/userprefix.js
View file

@ -26,7 +26,7 @@ module.exports = class {
await client.db.updateUser(message.author.id, 'prefix', args[0]);
message.channel.createMessage(
`${client.emojis.success} Your personal prefix has been set to: \`${args[0]}\``
`${client.config.emojis.success} Your personal prefix has been set to: \`${args[0]}\``
);
}
};