Merge PR #249 from TheBastionBot/v6-dev

Bastion Bot v6.13.4

changes.json

@@ -1,11 +1,9 @@
 {
-  "date": "June 3, 2018",
-  "image": "https://i.imgur.com/356dk6S.gif",
+  "date": "June 10, 2018",
+  "image": "https://i.imgur.com/MvpZk1P.gif",
   "IMPROVEMENTS": [
-    "`discrim` command will now show Discord user tag instead of user mentions.",
-    "Under-the-hood-improvements"
+    "`report` command will now remove your message too, and instantly! You don't need to delete your own message by yourself anymore if you wanted it removed.",
+    "Minor design improvements to the `pokemon` command."
   ],
-  "FIXES": [
-    "Fixed `streamerRole` command not showing the current Streamer Role."
-  ]
+  "FIXES": []
 }

modules/moderation/report.js

@@ -42,8 +42,9 @@ exports.exec = async (Bastion, message, args) => {
         title: 'User Reported',
         description: Bastion.strings.info(message.guild.language, 'report', message.author.tag, user.tag, reason)
       }
-    }).then(message => {
-      message.delete(5000).catch(() => {});
+    }).then(reportMessage => {
+      message.delete().catch(() => {});
+      reportMessage.delete(5000).catch(() => {});
     }).catch(e => {
       Bastion.log.error(e);
     });

modules/queries/pokemon.js

@@ -31,7 +31,7 @@ exports.exec = async (Bastion, message, args) => {
 
     let fields = [
       {
-        name: 'Pokédex Number',
+        name: 'Number',
         value: pokemon.number,
         inline: true
       },
@@ -42,7 +42,7 @@ exports.exec = async (Bastion, message, args) => {
       },
       {
         name: 'Types',
-        value: pokemon.types.join(', '),
+        value: pokemon.types.join('\n'),
         inline: true
       },
       {
@@ -52,12 +52,12 @@ exports.exec = async (Bastion, message, args) => {
       },
       {
         name: 'Egg Groups',
-        value: pokemon.eggGroups.join(', '),
+        value: pokemon.eggGroups.join('\n'),
         inline: true
       },
       {
-        name: 'Gender',
-        value: pokemon.gender.length ? `Male: ${pokemon.gender[0]}%\nFemale: ${pokemon.gender[1]}%` : 'Genderless',
+        name: 'Gender Ratio',
+        value: pokemon.gender.length ? `${pokemon.gender[0]}:${pokemon.gender[1]}` : 'Genderless',
         inline: true
       },
       {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bastion",
-  "version": "6.13.3",
+  "version": "6.13.4",
   "description": "Give awesome perks to your Discord server!",
   "url": "https://bastionbot.org/",
   "main": "index.js",