Code Improvements

This commit is contained in:
Daniel Odendahl Jr
2017-04-17 21:57:35 +00:00
parent 45ba18bea9
commit 9dd0589de5
46 changed files with 73 additions and 209 deletions
+3 -5
View File
@@ -30,6 +30,7 @@ module.exports = class BanCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('BAN_MEMBERS');
}
@@ -42,9 +43,7 @@ module.exports = class BanCommand extends Command {
}
if (!message.guild.channels.exists('name', 'mod_logs')) return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
let member = message.guild.member(args.member);
if (!member) {
member = await message.guild.fetchMember(args.member);
}
if (!member) member = await message.guild.fetchMember(args.member);
const reason = args.reason;
if (!member.bannable) return message.say(':x: Error! This member cannot be banned! Perhaps they have a higher role than me?');
try {
@@ -56,8 +55,7 @@ module.exports = class BanCommand extends Command {
.setTimestamp()
.setDescription(`**Member:** ${member.user.tag} (${member.id})\n**Action:** Ban\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').send({embed});
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
+3 -5
View File
@@ -27,6 +27,7 @@ module.exports = class KickCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('KICK_MEMBERS');
}
@@ -39,9 +40,7 @@ module.exports = class KickCommand extends Command {
}
if (!message.guild.channels.exists('name', 'mod_logs')) return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
let member = message.guild.member(args.member);
if (!member) {
member = await message.guild.fetchMember(args.member);
}
if (!member) member = await message.guild.fetchMember(args.member);
const reason = args.reason;
if (!member.bannable) return message.say(':x: Error! This member cannot be kicked! Perhaps they have a higher role than me?');
try {
@@ -53,8 +52,7 @@ module.exports = class KickCommand extends Command {
.setTimestamp()
.setDescription(`**Member:** ${member.user.tag} (${member.id})\n**Action:** Kick\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').send({embed});
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
+3 -4
View File
@@ -22,6 +22,7 @@ module.exports = class LockdownCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('ADMINISTRATOR');
}
@@ -38,8 +39,7 @@ module.exports = class LockdownCommand extends Command {
SEND_MESSAGES: false
});
return message.say('**Lockdown Started, users without Administrator can no longer post messages. Please use `;lockdown stop` to end the lockdown.**');
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
@@ -49,8 +49,7 @@ module.exports = class LockdownCommand extends Command {
SEND_MESSAGES: true
});
return message.say('**Lockdown Ended, users without Administrator can now post messages.**');
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
+2 -2
View File
@@ -34,6 +34,7 @@ module.exports = class PruneCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('MANAGE_MESSAGES');
}
@@ -51,8 +52,7 @@ module.exports = class PruneCommand extends Command {
});
await message.channel.bulkDelete(messages, true);
return null;
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong! Perhaps there are not enough messages in the channel from earlier than two weeks?');
}
}
+2 -2
View File
@@ -36,6 +36,7 @@ module.exports = class UnbanCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('BAN_MEMBERS');
}
@@ -61,8 +62,7 @@ module.exports = class UnbanCommand extends Command {
.setTimestamp()
.setDescription(`**Member:** ${unbanUser.tag} (${unbanUser.id})\n**Action:** Unban\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').send({embed});
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
+3 -5
View File
@@ -27,6 +27,7 @@ module.exports = class WarnCommand extends Command {
}]
});
}
hasPermission(msg) {
return msg.member.hasPermission('MANAGE_MESSAGES');
}
@@ -37,9 +38,7 @@ module.exports = class WarnCommand extends Command {
if (!message.channel.permissionsFor(this.client.user).hasPermission('EMBED_LINKS')) return message.say(':x: Error! I don\'t have the Embed Links Permission!');
}
let member = message.guild.member(args.member);
if (!member) {
member = await message.guild.fetchMember(args.member);
}
if (!member) member = await message.guild.fetchMember(args.member);
const reason = args.reason;
if (!message.guild.channels.exists('name', 'mod_logs')) return message.say(':x: Error! Could not find the mod_logs channel! Please create it!');
try {
@@ -50,8 +49,7 @@ module.exports = class WarnCommand extends Command {
.setTimestamp()
.setDescription(`**Member:** ${member.user.tag} (${member.id})\n**Action:** Warn\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').send({embed});
}
catch (err) {
} catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}