aboutsummaryrefslogtreecommitdiff
path: root/commands
diff options
context:
space:
mode:
Diffstat (limited to 'commands')
-rw-r--r--commands/ban.js23
1 files changed, 0 insertions, 23 deletions
diff --git a/commands/ban.js b/commands/ban.js
index 5fa3da4..0a90c5b 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -1,5 +1,4 @@
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();
@@ -19,25 +18,3 @@ 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