Another Rewrite Type Thing

This commit is contained in:
Daniel Odendahl Jr
2017-04-11 18:52:18 +00:00
parent 3867b30498
commit 85356dd2a9
82 changed files with 271 additions and 366 deletions
+5 -7
View File
@@ -43,18 +43,16 @@ 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!');
const member = args.member;
const reason = args.reason;
if (!message.guild.member(member).bannable) return message.say(':x: Error! This member cannot be banned! Perhaps they have a higher role than me?');
if (!member.bannable) return message.say(':x: Error! This member cannot be banned! Perhaps they have a higher role than me?');
try {
const banUser = await message.guild.member(member).ban();
const okHandMsg = await message.say(':ok_hand:');
await member.ban();
await message.say(':ok_hand:');
const embed = new RichEmbed()
.setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
.setColor(0xFF0000)
.setFooter('XiaoBot Moderation', this.client.user.avatarURL)
.setTimestamp()
.setDescription(`**Member:** ${banUser.user.username}#${banUser.user.discriminator} (${member.id})\n**Action:** Ban\n**Reason:** ${reason}`);
const modLogMsg = await message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
return [banUser, okHandMsg, modLogMsg];
.setDescription(`**Member:** ${member.user.username}#${member.user.discriminator} (${member.id})\n**Action:** Ban\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
}
catch (err) {
return message.say(':x: Error! Something went wrong!');
+5 -7
View File
@@ -40,18 +40,16 @@ 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!');
const member = args.member;
const reason = args.reason;
if (!message.guild.member(member).bannable) return message.say(':x: Error! This member cannot be kicked! Perhaps they have a higher role than me?');
if (!member.bannable) return message.say(':x: Error! This member cannot be kicked! Perhaps they have a higher role than me?');
try {
const kickUser = await message.guild.member(member).kick();
const okHandMsg = await message.say(':ok_hand:');
await member.kick();
await message.say(':ok_hand:');
const embed = new RichEmbed()
.setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
.setColor(0xFFA500)
.setFooter('XiaoBot Moderation', this.client.user.avatarURL)
.setTimestamp()
.setDescription(`**Member:** ${kickUser.user.username}#${kickUser.user.discriminator} (${member.id})\n**Action:** Kick\n**Reason:** ${reason}`);
const modLogMsg = await message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
return [kickUser, okHandMsg, modLogMsg];
.setDescription(`**Member:** ${member.user.username}#${member.user.discriminator} (${member.id})\n**Action:** Kick\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
}
catch (err) {
return message.say(':x: Error! Something went wrong!');
+4 -4
View File
@@ -31,19 +31,19 @@ module.exports = class LockdownCommand extends Command {
if (!message.channel.permissionsFor(this.client.user).hasPermission(['READ_MESSAGES', 'SEND_MESSAGES'])) return;
if (!message.channel.permissionsFor(this.client.user).hasPermission('ADMINISTRATOR')) return message.say(':x: Error! I don\'t have the Administrator permission! This is not given by default, as that\'s quite bad practice. Please give it to me to use the lockdown command!');
}
const type = args.type;
if (type.toLowerCase() === 'start') {
const type = args.type.toLowerCase();
if (type === 'start') {
try {
await message.channel.overwritePermissions(message.guild.defaultRole, {
SEND_MESSAGES: false
});
return message.say('**Lockdown Started, users without Administrator can no longer post messages. Please use ;lockdown stop to end the lockdown.**');
return message.say('**Lockdown Started, users without Administrator can no longer post messages. Please use `;lockdown stop` to end the lockdown.**');
}
catch (err) {
return message.say(':x: Error! Something went wrong!');
}
}
if (type.toLowerCase() === 'stop') {
if (type === 'stop') {
try {
await message.channel.overwritePermissions(message.guild.defaultRole, {
SEND_MESSAGES: true
+4 -5
View File
@@ -51,18 +51,17 @@ module.exports = class UnbanCommand extends Command {
const reason = args.reason;
const bans = await message.guild.fetchBans();
if (!bans.has(memberID)) return message.say(':x: Error! Could not find this user in the bans.');
const unbanUserObj = await bans.get(memberID);
const unbanUser = await bans.get(memberID);
try {
const unbanUser = await message.guild.unban(unbanUserObj);
const okHandMsg = await message.say(':ok_hand:');
await message.guild.unban(unbanUser);
await message.say(':ok_hand:');
const embed = new RichEmbed()
.setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
.setColor(0x00AE86)
.setFooter('XiaoBot Moderation', this.client.user.avatarURL)
.setTimestamp()
.setDescription(`**Member:** ${unbanUser.username}#${unbanUser.discriminator} (${unbanUser.id})\n**Action:** Unban\n**Reason:** ${reason}`);
const modLogMsg = await message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
return [unbanUser, okHandMsg, modLogMsg];
return message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
}
catch (err) {
return message.say(':x: Error! Something went wrong!');
+4 -5
View File
@@ -36,19 +36,18 @@ module.exports = class WarnCommand extends Command {
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!');
}
const userToWarn = args.member;
const member = 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 {
const okHandMsg = await message.say(':ok_hand:');
await message.say(':ok_hand:');
const embed = new RichEmbed()
.setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL)
.setColor(0xFFFF00)
.setFooter('XiaoBot Moderation', this.client.user.avatarURL)
.setTimestamp()
.setDescription(`**Member:** ${userToWarn.user.username}#${userToWarn.user.discriminator} (${userToWarn.id})\n**Action:** Warn\n**Reason:** ${reason}`);
const modLogMsg = await message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
return [okHandMsg, modLogMsg];
.setDescription(`**Member:** ${member.user.username}#${member.user.discriminator} (${member.id})\n**Action:** Warn\n**Reason:** ${reason}`);
return message.guild.channels.find('name', 'mod_logs').sendEmbed(embed);
}
catch (err) {
return message.say(':x: Error! Something went wrong!');