2 files changed, 44 insertions, 1 deletions
diff --git a/commands/ban.js b/commands/ban.js
index 7507a3d..5fa3da4 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -1,4 +1,25 @@
 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();
+  member.ban({ days: 7, reason: 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',
+};
+=======
     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,4 +39,5 @@ exports.run = (bot, msg, args) => {
     usage: '@<User> <...reason>',
     category: 'Moderation',
   };
-  
-\ No newline at end of file
+  
+>>>>>>> master
diff --git a/commands/softban.js b/commands/softban.js
new file mode 100644
index 0000000..acd29fc
--- /dev/null
+++ b/commands/softban.js
@@ -0,0 +1,21 @@
+exports.run = (bot, msg, args) => {
+  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({ days: 7, reason: msg.author.tag + ': ' + args.join(' ').slice(3 + member.user.id.length) }).then(() => {
+    msg.guild.unban(member.user.id);
+    msg.channel.send(`Alright, I softbanned **${member.user.tag}** for the reason **${args.join(' ').slice(3 + member.user.id.length)}**`);
+  });
+};
+
+exports.conf = {
+  aliases: [],
+  guildOnly: true,
+};
+
+exports.help = {
+  name: 'softban',
+  description: 'Kick the user and delete their messages',
+  usage: '@<User> <...reason>',
+  category: 'Moderation',
+};