Merge PR #171 from TheBastionBot/master

Bastion Bot v6.11.1

changes.json

@@ -1,14 +1,11 @@
 {
   "date": "April 1, 2018",
-  "image": "https://i.imgur.com/tIYEujJ.gif",
-  "ENHANCEMENTS": [
-    "Under-the-hood improvements."
-  ],
-  "NEW FEATURES": [
-    "You can now set the interval at which Bastion's activity changes."
+  "image": "https://i.imgur.com/fYmAcXh.gif",
+  "THESE BUGS ARE DEAD": [
+    "Fixed the issue that caused Bastion to go offline after a few moments, if you had set the activity interval."
   ],
-  "NEW COMMANDS": [
-    "Added `shardStats` command.",
-    "Added `pollStats` command."
+  "ENHANCEMENTS": [
+    "You can now set the streaming status from config too! Forget the `setStream` command. Who needs it anyway!",
+    "Some under-the-hood changes & improvements."
   ]
 }

events/ready.js

@@ -16,19 +16,24 @@ module.exports = async Bastion => {
       status: Bastion.config.status,
       game: {
         name: typeof Bastion.config.game.name === 'string' ? Bastion.config.game.name : Bastion.config.game.name.length ? Bastion.config.game.name[0] : null,
-        type: Bastion.config.game.type
+        type: Bastion.config.game.type,
+        url: Bastion.config.game.url
       }
     });
 
     if (typeof Bastion.config.game.name !== 'string' && Bastion.config.game.name.length) {
       Bastion.setInterval(async () => {
         try {
-          await Bastion.user.setActivity(Bastion.config.game.name[Math.floor(Math.random() * Bastion.config.game.name.length)], { type: Bastion.config.game.type });
+          await Bastion.user.setActivity(Bastion.config.game.name[Math.floor(Math.random() * Bastion.config.game.name.length)],
+            {
+              type: Bastion.config.game.type,
+              url: Bastion.config.game.url
+            });
         }
         catch (e) {
           Bastion.log.error(e);
         }
-      }, typeof Bastion.config.game.interval === 'number' && Bastion.config.game.interval || 60 * 60 * 1000);
+      }, ((typeof Bastion.config.game.interval === 'number' && Bastion.config.game.interval) || 60) * 60 * 1000);
     }
 
     let bastionGuilds = Bastion.guilds.map(g => g.id);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bastion",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "description": "Give awesome perks to your Discord server!",
   "url": "https://bastionbot.org/",
   "main": "index.js",
@@ -32,7 +32,7 @@
     "discord.js": "~11.3.2",
     "gamedig": "~1.0.45",
     "hirez.js": "~2.0.0",
-    "kitsu": "~5.0.7",
+    "kitsu": "~5.1.0",
     "lzutf8": "~0.5.0",
     "mathjs": "~4.0.1",
     "node-json-db": "~0.7.5",

renovate.json

@@ -1,7 +1,7 @@
 {
-  "branchPrefix": "deps/",
+  "branchPrefix": "dep/",
   "devDependencies": {
-    "branchPrefix": "dev-deps/"
+    "branchPrefix": "dev-dep/"
   },
   "enabled": true,
   "ignorePaths": [
@@ -15,7 +15,7 @@
     "dependencies"
   ],
   "optionalDependencies": {
-    "branchPrefix": "opt-deps/"
+    "branchPrefix": "opt-dep/"
   },
   "patch": {
     "automerge": true,

settings/config_example.json

@@ -7,6 +7,7 @@
     "name": [
       "with Ganymede"
     ],
+    "url": "",
     "interval": 60
   },
   "music": {