andrew-projects-archive/PokeBot
1
0
Fork 0
mirror of https://github.com/UniverseDevGroup/PokeBot.git synced 2025-01-23 09:51:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Unknown 2018-02-23 22:33:59 -05:00
commit e6d6e51882
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
commands/ban.js
View file

@ -1,4 +1,5 @@
exports.run = (bot, msg, args) => {
<<<<<<< HEAD
if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members');
if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members');
const member = msg.mentions.members.first();
@ -18,3 +19,25 @@ exports.help = {
usage: '@<User> <...reason>',
category: 'Moderation',
};
=======
if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members');
if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members');
const member = msg.mentions.members.first();
member.ban(msg.author.tag + ': ' + args.join(' ').slice(3 + member.user.id.length)).then(() => {
msg.channel.send(`Alright, I banned **${member.user.tag}** for the reason **${args.join(' ').slice(3 + member.user.id.length)}**`);
});
};
exports.conf = {
aliases: [],
guildOnly: true,
};
exports.help = {
name: 'ban',
description: 'Ban a user out of the server',
usage: '@<User> <...reason>',
category: 'Moderation',
};
>>>>>>> master