diff options
| author | Unknown <jtsshieh@outlook.com> | 2018-02-23 22:33:59 -0500 |
|---|---|---|
| committer | Unknown <jtsshieh@outlook.com> | 2018-02-23 22:33:59 -0500 |
| commit | e6d6e5188252141c00b97749d0cf3f3099af2432 (patch) | |
| tree | 71f0418b0133f8edace178e85b5a22a1fb6c2e10 | |
| parent | 3952227eae57ffe5c36b666322d4019e0c1f646b (diff) | |
| parent | c8eb132e8a90620ebdf980ef1b033b509dcaef07 (diff) | |
| download | PokeBot-e6d6e5188252141c00b97749d0cf3f3099af2432.tar.gz PokeBot-e6d6e5188252141c00b97749d0cf3f3099af2432.tar.bz2 PokeBot-e6d6e5188252141c00b97749d0cf3f3099af2432.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | commands/ban.js | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/commands/ban.js b/commands/ban.js index 0a90c5b..5fa3da4 100644 --- a/commands/ban.js +++ b/commands/ban.js @@ -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 |