Merge branch 'master' of https://github.com/PokeWorld/PokeBot

1 files changed, 14 insertions, 15 deletions

diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js
index 2db58ec..dd5b4a9 100644
--- a/commands/Moderation/softban.js
+++ b/commands/Moderation/softban.js
@@ -3,18 +3,7 @@
  *   SoftBan: Plugin for PokeBot that performs moderation actions.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
@@ -27,9 +16,19 @@ exports.run = async (bot, msg, args) => {
   const reason = args.join(' ').slice(3 + member.user.id.length);
 
   await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? reason : '') })
-    .catch(err => { msg.reply('There was an error.'); console.error(err.stack);});
-  await msg.guild.unban(member.user.id).catch(msg.reply('There was an error.'));
-  msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    .catch(err => {
+      msg.reply('There was an error.');
+      return console.error(err.stack);
+    })
+    .then(() => {
+      msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    });
+  await msg.guild.unban(member.user.id)
+    .catch(err => {
+      msg.reply('There was an error.');
+      return console.error(err.stack);
+    });
+
   const { RichEmbed } = require('discord.js');
   try {
     const embed = new RichEmbed()