Deps updates and welcomeMessage fix (#363)

Fixes #355
TheSharks · Sep 14, 2018 · 1fb408c · 1fb408c
1 parent e41093a
commit 1fb408c
Show file tree

Hide file tree

Showing 35 changed files with 654 additions and 974 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,33 +31,33 @@
   },
   "homepage": "https://docs.thesharks.xyz/",
   "devDependencies": {
-    "eslint": "^4.19.1",
-    "eslint-config-standard": "^11.0.0",
+    "eslint": "^5.5.0",
+    "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-node": "^7.0.1",
     "eslint-plugin-promise": "^3.8.0",
     "eslint-plugin-standard": "^3.1.0",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^7.0.0",
     "mocha": "^5.2.0",
-    "standard": "^10.0.3",
+    "standard": "^12.0.1",
     "uglify-es": "^3.3.9"
   },
   "dependencies": {
     "@thesharks/jagtag-js": "^1.0.3",
     "chalk": "^2.4.1",
-    "dotenv": "^4.0.0",
+    "dotenv": "^6.0.0",
     "eris": "^0.9.0",
     "moment": "^2.22.2",
     "superagent": "^3.8.3",
-    "ws": "^4.1.0",
+    "ws": "^6.0.0",
     "xml-js": "^1.6.7",
     "youtube-dl": "^1.12.2"
   },
   "optionalDependencies": {
     "arangojs": "^6.0.0",
-    "elasticsearch": "^14.0.0",
-    "eris-lavalink": "^1.0.0",
-    "hot-shots": "^5.4.1",
+    "elasticsearch": "^15.1.1",
+    "eris-lavalink": "^1.0.2",
+    "hot-shots": "^5.9.0",
     "lokijs": "^1.5.5",
     "raven": "^2.4.0"
   }

diff --git a/src/commands/ban.js b/src/commands/ban.js
@@ -41,7 +41,7 @@ module.exports = {
       if ([0, 1, 7].includes(days)) {
         const members = msg.mentions.filter(u => u.id !== bot.user.id).map((user) => msg.channel.guild.members.find(m => m.id === user.id))
         const reason = isNaN(chunks[0]) ? chunks.slice(members.length).join(' ').length === 0 ? 'No reason provided.' : chunks.slice(members.length).join(' ') : chunks.slice(members.length + 1).join(' ').length === 0 ? 'No reason provided.' : chunks.slice(members.length + 1).join(' ')
-        let list = {success: [], error: []}
+        let list = { success: [], error: [] }
 
         safeLoop(msg, days, members, reason, list)
       } else {

diff --git a/src/commands/booru.js b/src/commands/booru.js
@@ -44,10 +44,10 @@ module.exports = {
     switch (sites[parts[0]].apiStyle) {
       case 'gelbooru': { // Gelbooru interpretation has xml conversion to provide full support, although we do prefer JSON
         SA(sites[parts[0]].baseURL)
-          .query({page: 'dapi', s: 'post', q: 'index', tags: query})
-          .set({'User-Agent': 'Superagent Node.js'})
+          .query({ page: 'dapi', s: 'post', q: 'index', tags: query })
+          .set({ 'User-Agent': 'Superagent Node.js' })
           .then(res => {
-            const result = require('xml-js').xml2js(res.text, {compact: true})
+            const result = require('xml-js').xml2js(res.text, { compact: true })
             if (!result.posts.post || result.posts.post.length < 1) {
               return global.i18n.send('BOORU_NO_RESULTS', msg.channel, {
                 query: (query.length > 0) ? query : 'random'
@@ -63,8 +63,8 @@ module.exports = {
       }
       case 'rails-booru': {
         SA(sites[parts[0]].baseURL)
-          .query({q: parts.slice(1).join('+')})
-          .set({'User-Agent': 'Superagent Node.js'})
+          .query({ q: parts.slice(1).join('+') })
+          .set({ 'User-Agent': 'Superagent Node.js' })
           .then(res => {
             if (!res.body.search || res.body.search.length < 1) {
               return global.i18n.send('BOORU_NO_RESULTS', msg.channel, {
@@ -82,8 +82,8 @@ module.exports = {
       case 'e621': {
         // wow look at e621 being all special with their own api style
         SA(sites[parts[0]].baseURL)
-          .query({limit: '50', tags: parts.slice(1).join(' ')})
-          .set({'Accept': 'application/json', 'User-Agent': 'Superagent Node.js'})
+          .query({ limit: '50', tags: parts.slice(1).join(' ') })
+          .set({ 'Accept': 'application/json', 'User-Agent': 'Superagent Node.js' })
           .then(res => {
             if (res.body.length < 1) {
               return global.i18n.send('BOORU_NO_RESULTS', msg.channel, {

diff --git a/src/commands/fact.js b/src/commands/fact.js
@@ -11,7 +11,7 @@ module.exports = {
     request.get('http://www.fayd.org/api/fact.xml')
       .then(res => {
         if (res.statusCode !== 200) return global.i18n.send('API_ERROR', msg.channel)
-        const x = require('xml-js').xml2js(res.text, {compact: true})
+        const x = require('xml-js').xml2js(res.text, { compact: true })
         return msg.channel.createMessage(x.facts.fact._text)
       })
   }

diff --git a/src/commands/gif.js b/src/commands/gif.js
@@ -12,14 +12,14 @@ module.exports = {
     request
       .get('http://api.giphy.com/v1/gifs/random')
       .set('api_key', 'dc6zaTOxFJmzC')
-      .query({rating: msg.channel.nsfw === true ? 'r' : 'pg13', fmt: 'json'})
+      .query({ rating: msg.channel.nsfw === true ? 'r' : 'pg13', fmt: 'json' })
       .query(`tag=${encodeURIComponent(suffix.split(' ').join('+'))}`)
       .then(res => {
         if (res.statusCode !== 200 || res.body.meta.status !== 200) return global.i18n.send('API_ERROR', msg.channel)
         if (res.body.data.id !== undefined) {
           return msg.channel.createMessage(`http://media.giphy.com/media/${res.body.data.id}/giphy.gif`)
         } else {
-          return global.i18n.send('BOORU_NO_RESULTS', msg.channel, {query: suffix})
+          return global.i18n.send('BOORU_NO_RESULTS', msg.channel, { query: suffix })
         }
       })
   }

diff --git a/src/commands/hackban.js b/src/commands/hackban.js
@@ -20,7 +20,7 @@ module.exports = {
       msg.channel.createMessage('You need to provide an ID to ban! Mentions aren\'t supported for hackban.')
     } else {
       msg.channel.createMessage(`<@${msg.author.id}>, Please wait...`).then((m) => {
-        let banMembers = {success: [], error: []}
+        let banMembers = { success: [], error: [] }
         let idArray = []
         let reasonWords = []
         suffix.split(' ').map((id) => {

diff --git a/src/commands/info.js b/src/commands/info.js
@@ -10,21 +10,21 @@ module.exports = {
     let bot = global.bot
     let user = await bot.getRESTUser('107904023901777920')
     let owner = `${user.username}#${user.discriminator}`
-    let fields = [{name: 'Servers Connected', value: '```\n' + bot.guilds.size + '```', inline: true},
-      {name: 'Users Known', value: '```\n' + bot.users.size + '```', inline: true},
-      {name: 'Channels Connected', value: '```\n' + Object.keys(bot.channelGuildMap).length + '```', inline: true},
-      {name: 'Private Channels', value: '```\n' + Object.keys(bot.privateChannelMap).length + '```', inline: true},
-      {name: 'Owner', value: '```\n' + owner + '```', inline: true}
+    let fields = [{ name: 'Servers Connected', value: '```\n' + bot.guilds.size + '```', inline: true },
+      { name: 'Users Known', value: '```\n' + bot.users.size + '```', inline: true },
+      { name: 'Channels Connected', value: '```\n' + Object.keys(bot.channelGuildMap).length + '```', inline: true },
+      { name: 'Private Channels', value: '```\n' + Object.keys(bot.privateChannelMap).length + '```', inline: true },
+      { name: 'Owner', value: '```\n' + owner + '```', inline: true }
     ]
-    if (msg.channel.guild) fields.push({name: 'Shard ID', value: '```\n' + `${msg.channel.guild.shard.id}` + '```', inline: true})
-    msg.channel.createMessage({embed: {
+    if (msg.channel.guild) fields.push({ name: 'Shard ID', value: '```\n' + `${msg.channel.guild.shard.id}` + '```', inline: true })
+    msg.channel.createMessage({ embed: {
       color: 0x3498db,
-      author: {icon_url: bot.user.avatarURL, name: `${bot.user.username}#${bot.user.discriminator} (${bot.user.id})`},
+      author: { icon_url: bot.user.avatarURL, name: `${bot.user.username}#${bot.user.discriminator} (${bot.user.id})` },
       title: `Running on WildBeast version ${require('../../package.json').version}`,
       timestamp: new Date(),
       fields: fields,
       url: 'https://github.com/TheSharks/WildBeast',
-      footer: {text: `Started ${require('moment')(Date.now() - (Math.floor(process.uptime()) * 1000)).fromNow()}`}
-    }})
+      footer: { text: `Started ${require('moment')(Date.now() - (Math.floor(process.uptime()) * 1000)).fromNow()}` }
+    } })
   }
 }
diff --git a/src/commands/join-voice.js b/src/commands/join-voice.js
@@ -1,4 +1,4 @@
-const {createPlayer, resolveTracks, hhMMss} = require('../internal/encoder-selector.js')
+const { createPlayer, resolveTracks, hhMMss } = require('../internal/encoder-selector.js')
 const url = require('url')
 module.exports = {
   meta: {
@@ -15,10 +15,10 @@ module.exports = {
     } else if (!msg.member.voiceState.channelID) {
       global.i18n.send('JOIN_VOICE_CHANNEL', msg.channel)
     } else if (!msg.channel.guild.channels.find(c => c.id === msg.member.voiceState.channelID).permissionsOf(global.bot.user.id).has('voiceConnect') || !msg.channel.guild.channels.find(c => c.id === msg.member.voiceState.channelID).permissionsOf(global.bot.user.id).has('voiceSpeak')) {
-      global.i18n.send('NO_VOICE_CONNECT_PERM', msg.channel, {channel: msg.channel.guild.channels.find(c => c.id === msg.member.voiceState.channelID).name})
+      global.i18n.send('NO_VOICE_CONNECT_PERM', msg.channel, { channel: msg.channel.guild.channels.find(c => c.id === msg.member.voiceState.channelID).name })
     } else if (global.bot.voiceConnections.get(msg.channel.guild.id)) {
       const channelID = global.bot.voiceConnections.get(msg.channel.guild.id).channelId === undefined ? global.bot.voiceConnections.get(msg.channel.guild.id).channelID : global.bot.voiceConnections.get(msg.channel.guild.id).channelId
-      global.i18n.send('VOICE_CONNECTED', msg.channel, {channel: msg.channel.guild.channels.find(c => c.id === channelID).name})
+      global.i18n.send('VOICE_CONNECTED', msg.channel, { channel: msg.channel.guild.channels.find(c => c.id === channelID).name })
     } else {
       if (suffix) {
         let link = url.parse(suffix)
@@ -42,7 +42,7 @@ module.exports = {
             resolveTracks(suffix).then(result => {
               global.logger.trace(result)
               if (result.length === 0) {
-                global.i18n.send('LINK_NO_TRACK', msg.channel, {user: msg.author.username, url: suffix})
+                global.i18n.send('LINK_NO_TRACK', msg.channel, { user: msg.author.username, url: suffix })
               } else if (result.length === 1) {
                 hhMMss(result[0].info.length / 1000).then(time => {
                   createPlayer(msg, result)
@@ -54,15 +54,15 @@ module.exports = {
                 })
               } else {
                 createPlayer(msg, result)
-                global.i18n.send('TRACKS_ADDED', msg.channel, {count: result.length, user: msg.author.username})
+                global.i18n.send('TRACKS_ADDED', msg.channel, { count: result.length, user: msg.author.username })
               }
             }).catch(global.logger.error)
           }
         } else {
           resolveTracks(`ytsearch:${encodeURI(suffix)}`).then(result => {
             global.logger.trace(result)
             if (result.length === 0) {
-              global.i18n.send('SEARCH_NO_TRACKS', msg.channel, {user: msg.author.mention})
+              global.i18n.send('SEARCH_NO_TRACKS', msg.channel, { user: msg.author.mention })
             } else {
               hhMMss(result[0].info.length / 1000).then(time => {
                 createPlayer(msg, [result[0]])

diff --git a/src/commands/kick.js b/src/commands/kick.js
@@ -20,7 +20,7 @@ module.exports = {
       let chunks = suffix.split(' ')
       let members = msg.mentions.filter(u => u.id !== bot.user.id).map((user) => msg.channel.guild.members.get(user.id))
       let reason = chunks.slice(members.length).join(' ').length === 0 ? 'No reason provided.' : chunks.slice(members.length).join(' ')
-      let list = {success: [], error: []}
+      let list = { success: [], error: [] }
       safeLoop(msg, members, reason, list)
     }
 

diff --git a/src/commands/leave-voice.js b/src/commands/leave-voice.js
@@ -1,4 +1,4 @@
-const {leaveVoiceChannel} = require('../internal/encoder-selector.js')
+const { leaveVoiceChannel } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Make the bot leave the current voice channel.',

diff --git a/src/commands/nowplaying.js b/src/commands/nowplaying.js
@@ -1,4 +1,4 @@
-const {guildInfo, hhMMss, getTimestamp} = require('../internal/encoder-selector.js')
+const { guildInfo, hhMMss, getTimestamp } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Show the currently playing track.',

diff --git a/src/commands/pause.js b/src/commands/pause.js
@@ -1,4 +1,4 @@
-const {pause, guildInfo} = require('../internal/encoder-selector.js')
+const { pause, guildInfo } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Pause the playback of the current track.',

diff --git a/src/commands/queue.js b/src/commands/queue.js
@@ -1,4 +1,4 @@
-const {guildInfo, hhMMss} = require('../internal/encoder-selector.js')
+const { guildInfo, hhMMss } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Show the playback queue.',
@@ -17,10 +17,10 @@ module.exports = {
           const trackTitle = guildInfo[msg.channel.guild.id].tracks[i].info.title
           const trackLength = guildInfo[msg.channel.guild.id].tracks[i].info.length / 1000
           const trackRequester = msg.channel.guild.members.get(guildInfo[msg.channel.guild.id].tracks[i].requester)
-          arr.push(`**${i}**. **${trackTitle}** [${await hhMMss(trackLength)}] ${global.i18n.raw('TRACK_REQUESTED_BY', {user: trackRequester ? trackRequester.user.username : 'Unknown user'})}`) // In case user is not in guild
+          arr.push(`**${i}**. **${trackTitle}** [${await hhMMss(trackLength)}] ${global.i18n.raw('TRACK_REQUESTED_BY', { user: trackRequester ? trackRequester.user.username : 'Unknown user' })}`) // In case user is not in guild
           if (i === 10) {
             if (guildInfo[msg.channel.guild.id].tracks.length - 11 !== 0) {
-              arr.push(global.i18n.raw('MORE_SONGS', {count: guildInfo[msg.channel.guild.id].tracks.length - 11}))
+              arr.push(global.i18n.raw('MORE_SONGS', { count: guildInfo[msg.channel.guild.id].tracks.length - 11 }))
             }
             break
           }

diff --git a/src/commands/request.js b/src/commands/request.js
@@ -1,4 +1,4 @@
-const {resolveTracks, addTracks, hhMMss} = require('../internal/encoder-selector.js')
+const { resolveTracks, addTracks, hhMMss } = require('../internal/encoder-selector.js')
 const url = require('url')
 module.exports = {
   meta: {
@@ -15,7 +15,7 @@ module.exports = {
   fn: async (msg, suffix) => {
     if (global.bot.voiceConnections.get(msg.channel.guild.id)) {
       if (!suffix) {
-        global.i18n.send('NO_SEARCH_SUFFIX', msg.channel, {user: msg.author.mention})
+        global.i18n.send('NO_SEARCH_SUFFIX', msg.channel, { user: msg.author.mention })
       } else {
         let link = url.parse(suffix)
         let splitLink
@@ -38,7 +38,7 @@ module.exports = {
             resolveTracks(suffix).then(result => {
               global.logger.trace(result)
               if (result.length === 0) {
-                global.i18n.send('LINK_NO_TRACK', msg.channel, {user: msg.author.username, url: suffix})
+                global.i18n.send('LINK_NO_TRACK', msg.channel, { user: msg.author.username, url: suffix })
               } else if (result.length === 1) {
                 hhMMss(result[0].info.length / 1000).then(time => {
                   addTracks(msg, result)
@@ -50,15 +50,15 @@ module.exports = {
                 })
               } else {
                 addTracks(msg, result)
-                global.i18n.send('TRACKS_ADDED', msg.channel, {count: result.length, user: msg.author.username})
+                global.i18n.send('TRACKS_ADDED', msg.channel, { count: result.length, user: msg.author.username })
               }
             }).catch(global.logger.error)
           }
         } else {
           resolveTracks(`ytsearch:${encodeURI(suffix)}`).then(result => {
             global.logger.trace(result)
             if (result.length === 0) {
-              global.i18n.send('SEARCH_NO_TRACKS', msg.channel, {user: msg.author.mention})
+              global.i18n.send('SEARCH_NO_TRACKS', msg.channel, { user: msg.author.mention })
             } else {
               hhMMss(result[0].info.length / 1000).then(time => {
                 addTracks(msg, [result[0]])

diff --git a/src/commands/resume.js b/src/commands/resume.js
@@ -1,4 +1,4 @@
-const {resume, guildInfo} = require('../internal/encoder-selector.js')
+const { resume, guildInfo } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Resume the playback of the current track.',

diff --git a/src/commands/settings.js b/src/commands/settings.js
@@ -4,7 +4,7 @@ const whitelist = [
   'prefix',
   'language',
   'welcome',
-  'welcomeMessage'
+  'welcomemessage'
 ]
 
 module.exports = {
@@ -61,7 +61,7 @@ module.exports = {
         }
         await engine.modify(msg.channel.guild, parts[0], parts.slice(1).join(' '))
         if (parts[0] === 'language') {
-          return global.i18n.multiSend([{_key: 'SETTINGS_MODIFIED', opts: {setting: parts[0], value: parts.slice(1).join(' ')}}, {_key: 'LANGUAGE_DISCLAIMER'}], msg.channel)
+          return global.i18n.multiSend([{ _key: 'SETTINGS_MODIFIED', opts: { setting: parts[0], value: parts.slice(1).join(' ') } }, { _key: 'LANGUAGE_DISCLAIMER' }], msg.channel)
         } else {
           return global.i18n.send('SETTINGS_MODIFIED', msg.channel, {
             setting: parts[0],

diff --git a/src/commands/shuffle.js b/src/commands/shuffle.js
@@ -1,4 +1,4 @@
-const {guildInfo} = require('../internal/encoder-selector.js')
+const { guildInfo } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Shuffle the playback queue.',

diff --git a/src/commands/skip.js b/src/commands/skip.js
@@ -1,4 +1,4 @@
-const {guildInfo, hhMMss, skip, stop} = require('../internal/encoder-selector.js')
+const { guildInfo, hhMMss, skip, stop } = require('../internal/encoder-selector.js')
 module.exports = {
   meta: {
     help: 'Skip the current track.',

diff --git a/src/commands/softban.js b/src/commands/softban.js
@@ -19,7 +19,7 @@ module.exports = {
     } else if (msg.mentions.filter(m => m.id !== bot.user.id).length > 0) {
       msg.channel.createMessage('Please wait...').then((m) => {
         const membersToBan = msg.mentions.filter(m => m.id !== bot.user.id)
-        const banMembers = {success: [], error: []}
+        const banMembers = { success: [], error: [] }
         let reasonWords = []
         suffix.split(' ').map((id) => {
           if (id.startsWith('<@')) {
@@ -63,7 +63,7 @@ module.exports = {
       })
     } else {
       msg.channel.createMessage(`<@${msg.author.id}>, Please wait...`).then((m) => {
-        let banMembers = {success: [], error: []}
+        let banMembers = { success: [], error: [] }
         let idArray = []
         let reasonWords = []
         suffix.split(' ').map((id) => {

diff --git a/src/commands/stroke.js b/src/commands/stroke.js
@@ -19,9 +19,9 @@ module.exports = {
       name = ['Jake', 'Heinz']
     }
     request.get('http://api.icndb.com/jokes/random')
-      .query({escape: 'javascript'})
-      .query({firstName: name[0]})
-      .query({lastName: name[1]})
+      .query({ escape: 'javascript' })
+      .query({ firstName: name[0] })
+      .query({ lastName: name[1] })
       .end((err, res) => {
         if (!err && res.status === 200) {
           msg.channel.createMessage(res.body.value.joke)

diff --git a/src/commands/twitch.js b/src/commands/twitch.js
@@ -13,7 +13,7 @@ module.exports = {
       msg.channel.createMessage('No channel specified!')
     } else {
       SA.get(`https://api.twitch.tv/kraken/streams/${suffix}`)
-        .set({'Accept': 'application/vnd.twitchtv.v3+json', 'Client-ID': process.env.TWITCH_ID})
+        .set({ 'Accept': 'application/vnd.twitchtv.v3+json', 'Client-ID': process.env.TWITCH_ID })
         .end((err, response) => {
           if (err) global.logger.error(err)
           else if (!response.body) msg.channel.createMessage('The API returned an unconventional response.')