Rewrite Permission Checks and Validators

This commit is contained in:
Daniel Odendahl Jr
2017-04-25 02:37:14 +00:00
parent 9a75ee549b
commit 3ccce0ba66
105 changed files with 248 additions and 581 deletions
+12 -12
View File
@@ -17,9 +17,8 @@ module.exports = class UnbanCommand extends Command {
prompt: 'What member do you want to unban? Please enter the ID of the user.',
type: 'string',
validate: userID => {
if (userID.length === 18) {
if (userID.length === 18)
return true;
}
return `${userID} is not a valid ID. Please enter the user you wish to unban's ID.`;
}
}, {
@@ -27,9 +26,8 @@ module.exports = class UnbanCommand extends Command {
prompt: 'What do you want to set the reason as?',
type: 'string',
validate: reason => {
if (reason.length < 140) {
if (reason.length < 140)
return true;
}
return `Please keep your reason under 140 characters, you have ${reason.length}.`;
}
}]
@@ -41,15 +39,17 @@ module.exports = class UnbanCommand extends Command {
}
async run(message, args) {
if (message.channel.type !== 'dm') {
if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return;
if (!message.channel.permissionsFor(this.client.user).hasPermission('EMBED_LINKS')) return message.say(':x: Error! I don\'t have the Embed Links Permission!');
if (!message.channel.permissionsFor(this.client.user).hasPermission('BAN_MEMBERS')) return message.say(':x: Error! I don\'t have the Ban Members Permission!');
}
if (!message.guild.channels.exists('name', 'mod_logs')) return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
if (!message.channel.permissionsFor(this.client.user).hasPermission('BAN_MEMBERS'))
return message.say(':x: Error! I don\'t have the Ban Members Permission!');
const modlogs = message.guild.channels.find('name', 'mod_logs');
if (!modlogs)
return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
if (!modlogs.permissionsFor(this.client.user).hasPermission('EMBED_LINKS'))
return message.say(':x: Error! I don\'t have the Embed Links Permission!');
const { memberID, reason } = args;
const bans = await message.guild.fetchBans();
if (!bans.has(memberID)) return message.say(':x: Error! Could not find this user in the bans.');
if (!bans.has(memberID))
return message.say(':x: Error! Could not find this user in the bans.');
const unbanUser = await bans.get(memberID);
try {
await message.guild.unban(unbanUser);
@@ -59,7 +59,7 @@ module.exports = class UnbanCommand extends Command {
.setColor(0x00AE86)
.setTimestamp()
.setDescription(`**Member:** ${unbanUser.tag} (${unbanUser.id})\n**Action:** Unban\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').send({embed});
return modlogs.send({embed});
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}