refactor: Always use curly braces.

Author: sustained

.eslintrc.js

@@ -9,7 +9,8 @@ module.exports = {
     'prettier/prettier': 'error',
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'func-call-spacing': 'warn',
+    'func-call-spacing': 'error',
+    'curly': 'error'
   },
   parserOptions: {
     parser: 'babel-eslint',

src/client.js

@@ -98,12 +98,16 @@ process.on('unhandledRejection', console.error)
 */
 client.on('message', msg => {
   // Don't process own messages.
-  if (msg.author.id === msg.client.user.id) return
+  if (msg.author.id === msg.client.user.id) {
+    return
+  }
 
   client.jobs
     .filter(job => job.enabled)
     .forEach(job => {
-      if (job.shouldExecute(msg)) job.run(msg)
+      if (job.shouldExecute(msg)) {
+        job.run(msg)
+      }
     })
 })
 

src/commands/jobs/disable.js

@@ -28,8 +28,9 @@ module.exports = class JobsDisableCommand extends Command {
   }
 
   hasPermission(msg) {
-    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id)))
+    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id))) {
       return true
+    }
 
     return ALLOWED_USERS.includes(msg.author.id)
   }

src/commands/jobs/enable.js

@@ -28,8 +28,9 @@ module.exports = class JobsEnableCommand extends Command {
   }
 
   hasPermission(msg) {
-    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id)))
+    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id))) {
       return true
+    }
 
     return ALLOWED_USERS.includes(msg.author.id)
   }

src/commands/jobs/info.js

@@ -30,8 +30,9 @@ module.exports = class JobsEnableCommand extends Command {
   }
 
   hasPermission(msg) {
-    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id)))
+    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id))) {
       return true
+    }
 
     return ALLOWED_USERS.includes(msg.author.id)
   }
@@ -43,7 +44,9 @@ module.exports = class JobsEnableCommand extends Command {
       return msg.guild.roles.get(roleId).name
     })
 
-    if (!ignoredRoles.length) ignoredRoles = ['None']
+    if (!ignoredRoles.length) {
+      ignoredRoles = ['None']
+    }
 
     const embed = new RichEmbed()
     embed.setTitle('Job (' + job.name + ')')

src/commands/jobs/list.js

@@ -23,8 +23,9 @@ module.exports = class JobsEnableCommand extends Command {
   }
 
   hasPermission(msg) {
-    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id)))
+    if (msg.member.roles.some(role => ALLOWED_ROLES.includes(role.id))) {
       return true
+    }
 
     return ALLOWED_USERS.includes(msg.author.id)
   }

src/jobs/ban.js

@@ -34,20 +34,23 @@ export default class BanJob extends Job {
       !banWords.some(word =>
         msg.content.toLowerCase().includes(word.toLowerCase())
       )
-    )
+    ) {
       return false
+    }
 
     // We don't have permission to ban - bail.
-    if (!msg.channel.permissionsFor(msg.client.user).has('BAN_MEMBERS'))
+    if (!msg.channel.permissionsFor(msg.client.user).has('BAN_MEMBERS')) {
       return !!console.warn('[BanJob] Cannot ban - lacking permission.')
+    }
 
     const botMember = msg.guild.member(msg.client.user)
     const botHighestRole = botMember.highestRole.calculatedPosition
     const userHighestRole = msg.member.highestRole.calculatedPosition
 
     // Our role is not high enough in the hierarchy to ban - bail.
-    if (botHighestRole < userHighestRole)
+    if (botHighestRole < userHighestRole) {
       return !!console.warn('[BanJob] Cannot ban - role too low.')
+    }
 
     return true
   }
@@ -57,10 +60,11 @@ export default class BanJob extends Job {
       channel => channel.name === this.config.logChannel.name
     )
 
-    if (!logChannel)
+    if (!logChannel) {
       return console.warn(
         `WarnJob: Could not find channel with name ${this.config.logChannel.name}`
       )
+    }
 
     if (DEBUG_MODE) {
       return this.log(msg, logChannel)
@@ -73,11 +77,12 @@ export default class BanJob extends Job {
   }
 
   log(msg, logChannel) {
-    if (!logChannel)
+    if (!logChannel) {
       return console.info(
         `Banned user: ${msg.author}`,
         `Due to message: ${msg.cleanContent}`
       )
+    }
 
     const embed = new RichEmbed()
     embed.setTitle('Banned User')

src/jobs/warn.js

@@ -37,10 +37,11 @@ export default class WarnJob extends Job {
       channel => channel.name === this.config.notifyChannel.name
     )
 
-    if (!notifyChannel)
+    if (!notifyChannel) {
       return console.warn(
         `WarnJob: Could not find channel with name ${this.config.notifyChannel.name}`
       )
+    }
 
     notifyChannel.send(
       `${notifyRole} Suspicious user: ${msg.author} in channel ${msg.channel}`

src/lib/job.js

@@ -11,14 +11,18 @@ export default class Job {
     }
 
     ;['roles', 'users', 'channels', 'categories'].forEach(key => {
-      if (!options.ignored[key]) options.ignored[key] = []
+      if (!options.ignored[key]) {
+        options.ignored[key] = []
+      }
     })
 
     if (!options.config) {
       options.config = {}
     }
 
-    if (typeof options.enabled === 'undefined') options.enabled = false
+    if (typeof options.enabled === 'undefined') {
+      options.enabled = false
+    }
 
     this.name = options.name
     this.config = options.config
@@ -29,13 +33,16 @@ export default class Job {
 
   shouldExecute(msg) {
     if (msg.channel.type === 'dm') {
-      if (this.guildOnly) return
+      if (this.guildOnly) {
+        return
+      }
 
       return true
     }
 
-    if (this.ignored.roles.length)
+    if (this.ignored.roles.length) {
       return msg.member.roles.some(role => this.ignored.roles.includes(role.id))
+    }
 
     return true
   }