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

3 files changed, 120 insertions, 20 deletions

diff --git a/commands/Moderation/timeout.js b/commands/Moderation/timeout.js
new file mode 100644
index 0000000..fca7bed
--- /dev/null
+++ b/commands/Moderation/timeout.js
@@ -0,0 +1,57 @@
+/** **************************************
+ *
+ *   Time Out: Plugin for PokeBot that punishes bad boys..
+ *   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/>.
+ *
+ * *************************************/
+
+exports.run = async (bot, msg, args) => {
+    if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to put members in time-out..');
+    if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in time-out.');
+  
+    const member = msg.mentions.members.first();
+    if (!member) return await msg.reply('Who do I put in time-out?');
+  
+    msg.member.addRole(msg.guild.roles.find('name', 'Timeout'));
+  
+    const { RichEmbed } = require('discord.js');
+    try {
+      const embed = new RichEmbed()
+        .setColor(0x00ae86)
+        .setAuthor(member.user.tag, member.user.avatarURL)
+        .setTitle(`Time Out: **${member.user.tag}**`)
+        .setDescription(`*${member.user.tag}* was placed in time-out by *${msg.author.tag}*.`)
+        .addField('Moderator', msg.author.tag)
+        .setTimestamp()
+        .setFooter(`${msg.author.tag} put ${member.user.tag} in time-out.`, msg.author.avatarURL);
+      msg.guild.channels.find('name', 'logs').send({ embed });
+    }
+    catch (err) {
+      console.error(err.stack);
+    }
+  };
+  
+  exports.conf = {
+    aliases: [],
+    guildOnly: true,
+  };
+  
+  exports.help = {
+    name: 'timeout',
+    description: 'Put a user in time-out',
+    usage: '@user',
+  };
+  
\ No newline at end of file
diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js
new file mode 100644
index 0000000..1c2131f
--- /dev/null
+++ b/commands/Pokemon/forcedrop.js
@@ -0,0 +1,43 @@
+/** **************************************
+ *
+ *   Ban: Plugin for PokeBot that powers the PokeWorld gym system.
+ *   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/>.
+ *
+ * *************************************/
+
+exports.run = async (bot, msg) => {
+  if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to ban members.');
+
+  if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!');
+  if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
+  if (msg.channel.topic == 'Current Owner: *none*') {
+    msg.reply('This gym does not have an owner.');
+  }
+  else {
+    msg.channel.setTopic('Current Owner: *none*');
+    msg.channel.send('You have dropped the gym.');
+  }
+};
+
+exports.conf = {
+  aliases: [],
+  guildOnly: true,
+};
+
+exports.help = {
+  name: 'forcedrop',
+  description: 'Force a gym to have no owner.',
+};
diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js
index 99640d1..6be75be 100644
--- a/commands/Pokemon/join.js
+++ b/commands/Pokemon/join.js
@@ -24,27 +24,27 @@ exports.run = async (bot, msg, args) => {
   if (args.length < 1) return msg.reply('Please choose a team to join');
 
   const team = findTeam(msg, args[0]);
-  switch(args[0])
+  switch (args[0])
   {
-  case 'aqua': {
-    msg.member.addRole(msg.guild.roles.find('name', 'Aqua'));
-    msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Aqua.`);
-    break;
-  }
-  case 'rocket' : {
-    msg.member.addRole(msg.guild.roles.find('name', 'Rocket'));
-    msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Rocket.`);
-    break;
-  }
-  case 'magma' : {
-    msg.member.addRole(msg.guild.roles.find('name', 'Magma'));
-    msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Magma.`);
-    break;
-  }
-  default : {
-    msg.reply('You have to pick, aqua, rocket, or magma.');
-    break;
-  }
+    case 'aqua': {
+      msg.member.addRole(msg.guild.roles.find('name', 'Aqua'));
+      msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Aqua.`);
+      break;
+    }
+    case 'rocket' : {
+      msg.member.addRole(msg.guild.roles.find('name', 'Rocket'));
+      msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Rocket.`);
+      break;
+    }
+    case 'magma' : {
+      msg.member.addRole(msg.guild.roles.find('name', 'Magma'));
+      msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Magma.`);
+      break;
+    }
+    default : {
+      msg.reply('You have to pick, aqua, rocket, or magma.');
+      break;
+    }
   }
 };