Merge PR #186 from TheBastionBot/v6-dev

Bastion v6.11.5

appveyor.yml

@@ -20,4 +20,10 @@ test_script:
   - node --version
   - npm --version
   - npm test
+on_success:
+  - ps: Invoke-RestMethod https://github.com/k3rn31p4nic/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+  - ps: Invoke-RestMethod https://github.com/k3rn31p4nic/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL
 deploy: off

changes.json

@@ -1,12 +1,10 @@
 {
-  "date": "April 9, 2018",
-  "image": "https://i.imgur.com/xIt8xbz.gif",
-  "BUG FIXES": [
-    "Fixed an issue where Bastion didn't wanted to let you know how much currency you got when you used the `claim` command.",
-    "Fixed an issue that prevented command strings to fall back to English when a string is not available in other languages.",
-    "Under-the-hood fixes."
-  ],
+  "date": "April 15, 2018",
+  "image": "https://i.imgur.com/R5rQ4qG.gif",
+  "BUG FIXES": [],
   "IMROVEMENTS": [
-    "Under-the-hood improvements."
+    "Bastion is now more expressive with the `generateInvite` command.",
+    "Auto delete level up messages.",
+    "Under-the-hood improvements"
   ]
 }

handlers/levelHandler.js

@@ -35,6 +35,8 @@ module.exports = async message => {
             title: 'Leveled up',
             description: `:up: **${message.author.username}**#${message.author.discriminator} leveled up to **Level ${currentLevel}**`
           }
+        }).then(msg => {
+          msg.delete(5000).catch(() => {});
         }).catch(e => {
           message.client.log.error(e);
         });

locales/en/info.json

@@ -3,13 +3,13 @@
   "createEmoji": "%var% created the emoji **%var%**",
   "createRole": "%var% created the role **%var%**",
   "deleteChannel": "%var% deleted the %var% channel **%var%**",
-  "deleteChannelTopic": "%var% deleted the topic the **%var%** channel.",
+  "deleteChannelTopic": "%var% deleted the topic of the **%var%** channel.",
   "deleteRole": "%var% deleted the role **%var%**",
   "renameChannel": "%var% renamed the %var% channel **%var%** to **%var%**",
   "renameRole": "%var% renamed the role **%var%** to **%var%**",
   "selfAssignRole": "%var% you've been given the **%var%** role.",
   "selfRemoveRole": "%var% you've been removed from the **%var%** role.",
-  "updateChannelTopic": "%var% updated the topic the **%var%** channel to: ```\n%var%```",
+  "updateChannelTopic": "%var% updated the topic of the **%var%** channel to: ```\n%var%```",
   "updateRoleColor": "%var% updated the color of **%var%** role to **%var%**",
 
   "disableAnnouncementChannel": "%var% disabled the announcement channel.",

modules/money/claim.js

@@ -11,10 +11,8 @@ exports.exec = (Bastion, message) => {
   if (!claimedUsers.includes(message.author.id)) {
     let rewardAmount = Bastion.functions.getRandomInt(50, 100);
 
-    let claimMessage, rewardMessage;
+    let rewardMessage;
     if (Bastion.user.id === '267035345537728512') {
-      claimMessage = `${message.author} You've claimed your daily reward. Please check my message in your DM to see the reward amount.\n\n*If you want to get more Bastion Currencies when you use this command, check out the [FAQ](https://bastionbot.org/faq) on **How can I get more Bastion Currency with the claim/daily command?***`;
-
       if (message.guild.id === specialIDs.bastionGuild) {
         rewardAmount *= 2;
         if (message.member && message.member.roles.has(specialIDs.patronsRole)) {
@@ -27,11 +25,11 @@ exports.exec = (Bastion, message) => {
         rewardMessage = `Your account has been debited with **${rewardAmount}** Bastion Currencies.`;
       }
       else {
-        rewardMessage = `Your account has been debited with **${rewardAmount}** Bastion Currencies.\n\nUse the \`claim\`/\`daily\` command in [Bastion HQ](https://discord.gg/fzx8fkt) to get 2x more rewards.`;
+        rewardMessage = `Your account has been debited with **${rewardAmount}** Bastion Currencies.\n\n`
+          + '💡 **Pro Tip**\nYou can get **2x** more Bastion Currencies when you use the `claim` or `daily` command in [Bastion HQ](https://discord.gg/fzx8fkt): https://discord.gg/fzx8fkt';
       }
     }
     else {
-      claimMessage = `${message.author} You've claimed your daily reward. Please check my message in your DM to see the reward amount.`;
       rewardMessage = `Your account has been debited with **${rewardAmount}** Bastion Currencies.`;
     }
 
@@ -47,7 +45,7 @@ exports.exec = (Bastion, message) => {
     message.channel.send({
       embed: {
         color: Bastion.colors.GREEN,
-        description: claimMessage
+        description: `${message.author} You've claimed your daily reward. Please check my message in your DM to see the reward amount.`
       }
     }).catch(e => {
       Bastion.log.error(e);

modules/queries/generateInvite.js

@@ -11,7 +11,10 @@ exports.exec = async (Bastion, message, args) => {
       maxUses: args.uses
     });
 
-    message.channel.send(`discord.gg/${invite.code}`).catch(e => {
+    message.channel.send('Hello. Beep. Boop.\n'
+      + 'If you wanna invite friends to this server, share the following invite'
+      + ' link with your friends.\nBeep!\n' +
+      `https://discord.gg/${invite.code}`).catch(e => {
       Bastion.log.error(e);
     });
   }

package.json

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