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

4 files changed, 202 insertions, 169 deletions

diff --git a/commands/ban.js b/commands/ban.js
index 8d794d2..33c9277 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -9,6 +9,23 @@ exports.run = async (bot, msg, args) => {
   await member.ban({ days: 7, reason: msg.author.tag + (reason ? ': ' + reason : '') })
     .catch(err => { msg.reply('There was an error.'); console.error(err.stack);});
   msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+
+  const { RichEmbed } = require('discord.js');
+  try {
+    const embed = new RichEmbed()
+      .setColor(0x00ae86)
+      .setAuthor(member.user.tag, member.user.avatarURL)
+      .setTitle(`:hammer: **${member.user.tag}**`)
+      .setDescription(`*${member.user.tag}}* was banned from the server by *${msg.author.tag}*.`)
+      .addField('Reason', reason)
+      .addField('Moderator', msg.author.tag)
+      .setTimestamp()
+      .setFooter(`${msg.author.tag} banned ${member.user.tag}`, msg.author.avatarURL);
+    msg.guild.channels.find('name', 'logs').send({ embed });
+  }
+  catch (err) {
+    console.error(err.stack);
+  }
 };
 
 exports.conf = {
diff --git a/commands/og151.js b/commands/og151.js
index 0227f88..fd7f3e5 100644
--- a/commands/og151.js
+++ b/commands/og151.js
@@ -1,169 +1,168 @@
-exports.run = (bot, msg, args) => {
-    const pokemon = [
-        'Abra',
-        'Aerodactyl',
-        'Alakazam',
-        'Arbok',
-        'Arcanine',
-        'Articuno',
-        'Beedrill',
-        'Bellsprout',
-        'Blastoise',
-        'Bulbasaur',
-        'Butterfree',
-        'Caterpie',
-        'Chansey',
-        'Charizard',
-        'Charmander',
-        'Charmeleon',
-        'Clefable',
-        'Clefairy',
-        'Cloyster',
-        'Cubone',
-        'Dewgong',
-        'Diglett',
-        'Ditto',
-        'Dodrio',
-        'Doduo',
-        'Dragonair',
-        'Dragonite',
-        'Dratini',
-        'Drowzee',
-        'Dugtrio',
-        'Eevee',
-        'Ekans',
-        'Electabuzz',
-        'Electrode',
-        'Exeggcute',
-        'Exeggutor',
-        'Farfetch’d',
-        'Fearow',
-        'Flareon',
-        'Gastly',
-        'Gengar',
-        'Geodude',
-        'Gloom',
-        'Golbat',
-        'Goldeen',
-        'Golduck',
-        'Golem',
-        'Graveler',
-        'Grimer',
-        'Growlithe',
-        'Gyarados',
-        'Haunter',
-        'Hitmonchan',
-        'Hitmonlee',
-        'Horsea',
-        'Hypno',
-        'Ivysaur',
-        'Jigglypuff',
-        'Jolteon',
-        'Jynx',
-        'Kabuto',
-        'Kabutops',
-        'Kadabra',
-        'Kakuna',
-        'Kangaskhan',
-        'Kingler',
-        'Koffing',
-        'Krabby',
-        'Lapras',
-        'Lickitung',
-        'Machamp',
-        'Machoke',
-        'Machop',
-        'Magikarp',
-        'Magmar',
-        'Magnemite',
-        'Magneton',
-        'Mankey',
-        'Marowak',
-        'Meowth',
-        'Metapod',
-        'Mew',
-        'Mewtwo',
-        'Moltres',
-        'Mr. Mime',
-        'Muk',
-        'Nidoking',
-        'Nidoqueen',
-        'Nidoran♀',
-        'Nidoran♂',
-        'Nidorina',
-        'Nidorino',
-        'Ninetales',
-        'Oddish',
-        'Omanyte',
-        'Omastar',
-        'Onix',
-        'Paras',
-        'Parasect',
-        'Persian',
-        'Pidgeot',
-        'Pidgeotto',
-        'Pidgey',
-        'Pikachu',
-        'Pinsir',
-        'Poliwag',
-        'Poliwhirl',
-        'Poliwrath',
-        'Ponyta',
-        'Porygon',
-        'Primeape',
-        'Psyduck',
-        'Raichu',
-        'Rapidash',
-        'Raticate',
-        'Rattata',
-        'Rhydon',
-        'Rhyhorn',
-        'Sandshrew',
-        'Sandslash',
-        'Scyther',
-        'Seadra',
-        'Seaking',
-        'Seel',
-        'Shellder',
-        'Slowbro',
-        'Slowpoke',
-        'Snorlax',
-        'Spearow',
-        'Squirtle',
-        'Starmie',
-        'Staryu',
-        'Tangela',
-        'Tauros',
-        'Tentacool',
-        'Tentacruel',
-        'Vaporeon',
-        'Venomoth',
-        'Venonat',
-        'Venusaur',
-        'Victreebel',
-        'Vileplume',
-        'Voltorb',
-        'Vulpix',
-        'Wartortle',
-        'Weedle',
-        'Weepinbell',
-        'Weezing',
-        'Wigglytuff',
-        'Zapdos',
-        'Zubat',
-    ];
-  
-    msg.channel.send(pokemon[Math.floor(Math.random() * pokemon.length)]);
-  };
-  
-  exports.conf = {
-    aliases: [],
-    guildOnly: true,
-  };
-  
-  exports.help = {
-    name: 'og151',
-    description: 'Randomly picks one of the generation 1 pokemon, and gives you its name.',
-    category: 'Fun',
-  };
-  
\ No newline at end of file
+exports.run = (bot, msg) => {
+  const pokemon = [
+    'Abra',
+    'Aerodactyl',
+    'Alakazam',
+    'Arbok',
+    'Arcanine',
+    'Articuno',
+    'Beedrill',
+    'Bellsprout',
+    'Blastoise',
+    'Bulbasaur',
+    'Butterfree',
+    'Caterpie',
+    'Chansey',
+    'Charizard',
+    'Charmander',
+    'Charmeleon',
+    'Clefable',
+    'Clefairy',
+    'Cloyster',
+    'Cubone',
+    'Dewgong',
+    'Diglett',
+    'Ditto',
+    'Dodrio',
+    'Doduo',
+    'Dragonair',
+    'Dragonite',
+    'Dratini',
+    'Drowzee',
+    'Dugtrio',
+    'Eevee',
+    'Ekans',
+    'Electabuzz',
+    'Electrode',
+    'Exeggcute',
+    'Exeggutor',
+    'Farfetch’d',
+    'Fearow',
+    'Flareon',
+    'Gastly',
+    'Gengar',
+    'Geodude',
+    'Gloom',
+    'Golbat',
+    'Goldeen',
+    'Golduck',
+    'Golem',
+    'Graveler',
+    'Grimer',
+    'Growlithe',
+    'Gyarados',
+    'Haunter',
+    'Hitmonchan',
+    'Hitmonlee',
+    'Horsea',
+    'Hypno',
+    'Ivysaur',
+    'Jigglypuff',
+    'Jolteon',
+    'Jynx',
+    'Kabuto',
+    'Kabutops',
+    'Kadabra',
+    'Kakuna',
+    'Kangaskhan',
+    'Kingler',
+    'Koffing',
+    'Krabby',
+    'Lapras',
+    'Lickitung',
+    'Machamp',
+    'Machoke',
+    'Machop',
+    'Magikarp',
+    'Magmar',
+    'Magnemite',
+    'Magneton',
+    'Mankey',
+    'Marowak',
+    'Meowth',
+    'Metapod',
+    'Mew',
+    'Mewtwo',
+    'Moltres',
+    'Mr. Mime',
+    'Muk',
+    'Nidoking',
+    'Nidoqueen',
+    'Nidoran♀',
+    'Nidoran♂',
+    'Nidorina',
+    'Nidorino',
+    'Ninetales',
+    'Oddish',
+    'Omanyte',
+    'Omastar',
+    'Onix',
+    'Paras',
+    'Parasect',
+    'Persian',
+    'Pidgeot',
+    'Pidgeotto',
+    'Pidgey',
+    'Pikachu',
+    'Pinsir',
+    'Poliwag',
+    'Poliwhirl',
+    'Poliwrath',
+    'Ponyta',
+    'Porygon',
+    'Primeape',
+    'Psyduck',
+    'Raichu',
+    'Rapidash',
+    'Raticate',
+    'Rattata',
+    'Rhydon',
+    'Rhyhorn',
+    'Sandshrew',
+    'Sandslash',
+    'Scyther',
+    'Seadra',
+    'Seaking',
+    'Seel',
+    'Shellder',
+    'Slowbro',
+    'Slowpoke',
+    'Snorlax',
+    'Spearow',
+    'Squirtle',
+    'Starmie',
+    'Staryu',
+    'Tangela',
+    'Tauros',
+    'Tentacool',
+    'Tentacruel',
+    'Vaporeon',
+    'Venomoth',
+    'Venonat',
+    'Venusaur',
+    'Victreebel',
+    'Vileplume',
+    'Voltorb',
+    'Vulpix',
+    'Wartortle',
+    'Weedle',
+    'Weepinbell',
+    'Weezing',
+    'Wigglytuff',
+    'Zapdos',
+    'Zubat',
+  ];
+
+  msg.channel.send(pokemon[Math.floor(Math.random() * pokemon.length)]);
+};
+
+exports.conf = {
+  aliases: [],
+  guildOnly: true,
+};
+
+exports.help = {
+  name: 'og151',
+  description: 'Randomly picks one of the generation 1 pokemon, and gives you its name.',
+  category: 'Fun',
+};
diff --git a/commands/softban.js b/commands/softban.js
index d17b8c1..ff5d4b5 100644
--- a/commands/softban.js
+++ b/commands/softban.js
@@ -10,6 +10,22 @@ exports.run = async (bot, msg, args) => {
     .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}**.` : '.')}`);
+  const { RichEmbed } = require('discord.js');
+  try {
+    const embed = new RichEmbed()
+      .setColor(0x00ae86)
+      .setAuthor(member.user.tag, member.user.avatarURL)
+      .setTitle(`:hammer: **${member.user.tag}**`)
+      .setDescription(`*${member.user.tag}}* was softbanned from the server by *${msg.author.tag}*.`)
+      .addField('Reason', reason)
+      .addField('Moderator', msg.author.tag)
+      .setTimestamp()
+      .setFooter(`${msg.author.tag} softbanned ${member.user.tag}`, msg.author.avatarURL);
+    msg.guild.channels.find('name', 'logs').send({ embed });
+  }
+  catch (err) {
+    console.error(err.stack);
+  }
 };
 
 exports.conf = {
diff --git a/commands/warn.js b/commands/warn.js
index e16cd08..a20cf08 100644
--- a/commands/warn.js
+++ b/commands/warn.js
@@ -11,6 +11,7 @@ exports.run = (bot, msg, args) => {
     new RichEmbed()
       .setColor(0x00ae86)
       .setTitle(':warning: Warning')
+      .setAuthor(victim.user.tag, victim.user.avatarURL)
       .addField('Warning Reason', warnReason)
       .addField('ID', victim.id, true)
       .addField('Created Account', victim.user.createdAt, true)