chore(deps): update dependency eslint-config-airbnb-base to v13 (#6599)

* chore(deps): update dependency eslint-config-airbnb-base to v13

* chore: #6599, linting 😬

.eslintrc

@@ -40,6 +40,7 @@
 			"avoidEscape": true,
 			"allowTemplateLiterals": true
 		}],
+		"no-else-return": [ "error", { "allowElseIf": true } ],
 
 		// ES6
 		"prefer-rest-params": "off",

app.js

@@ -89,4 +89,3 @@ if (nconf.get('setup') || nconf.get('install')) {
 } else {
 	require('./src/start').start();
 }
-

install/package.json

@@ -127,7 +127,7 @@
     "devDependencies": {
         "coveralls": "3.0.2",
         "eslint": "5.8.0",
-        "eslint-config-airbnb-base": "12.1.0",
+        "eslint-config-airbnb-base": "13.1.0",
         "eslint-plugin-import": "2.14.0",
         "grunt": "1.0.3",
         "grunt-contrib-watch": "1.1.0",

public/src/admin/admin.js

@@ -99,9 +99,9 @@
 			} else {
 				var matches = url.match(/admin\/(.+?)\/(.+?)$/);
 				mainTitle = '[[admin/menu:' + matches[1] + '/' + matches[2] + ']]';
-				pageTitle = '[[admin/menu:section-' +
+				pageTitle = '[[admin/menu:section-'
-					(matches[1] === 'development' ? 'advanced' : matches[1]) +
+					+ (matches[1] === 'development' ? 'advanced' : matches[1])
-					']]' + (matches[2] ? (' > ' + mainTitle) : '');
+					+ ']]' + (matches[2] ? (' > ' + mainTitle) : '');
 				if (matches[2] === 'settings') {
 					mainTitle = translator.compile('admin/menu:settings.page-title', mainTitle);
 				}

public/src/admin/general/dashboard.js

@@ -62,22 +62,22 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress'
 
 		graphData.rooms = data;
 
-		var html = '<div class="text-center pull-left">' +
+		var html = '<div class="text-center pull-left">'
-						'<span class="formatted-number">' + data.onlineRegisteredCount + '</span>' +
+						+ '<span class="formatted-number">' + data.onlineRegisteredCount + '</span>'
-						'<div class="stat">[[admin/general/dashboard:active-users.users]]</div>' +
+						+ '<div class="stat">[[admin/general/dashboard:active-users.users]]</div>'
-					'</div>' +
+					+ '</div>'
-					'<div class="text-center pull-left">' +
+					+ '<div class="text-center pull-left">'
-						'<span class="formatted-number">' + data.onlineGuestCount + '</span>' +
+						+ '<span class="formatted-number">' + data.onlineGuestCount + '</span>'
-						'<div class="stat">[[admin/general/dashboard:active-users.guests]]</div>' +
+						+ '<div class="stat">[[admin/general/dashboard:active-users.guests]]</div>'
-					'</div>' +
+					+ '</div>'
-					'<div class="text-center pull-left">' +
+					+ '<div class="text-center pull-left">'
-						'<span class="formatted-number">' + (data.onlineRegisteredCount + data.onlineGuestCount) + '</span>' +
+						+ '<span class="formatted-number">' + (data.onlineRegisteredCount + data.onlineGuestCount) + '</span>'
-						'<div class="stat">[[admin/general/dashboard:active-users.total]]</div>' +
+						+ '<div class="stat">[[admin/general/dashboard:active-users.total]]</div>'
-					'</div>' +
+					+ '</div>'
-					'<div class="text-center pull-left">' +
+					+ '<div class="text-center pull-left">'
-						'<span class="formatted-number">' + data.socketCount + '</span>' +
+						+ '<span class="formatted-number">' + data.socketCount + '</span>'
-						'<div class="stat">[[admin/general/dashboard:active-users.connections]]</div>' +
+						+ '<div class="stat">[[admin/general/dashboard:active-users.connections]]</div>'
-					'</div>';
+					+ '</div>';
 
 		updateRegisteredGraph(data.onlineRegisteredCount, data.onlineGuestCount);
 		updatePresenceGraph(data.users);
@@ -506,10 +506,10 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress'
 			topics.forEach(function (topic, i) {
 				var	label = topic.count === '0' ? topic.title : '<a title="' + topic.title + '"href="' + RELATIVE_PATH + '/topic/' + topic.tid + '" target="_blank"> ' + topic.title + '</a>';
 
-				html += '<li>' +
+				html += '<li>'
-					'<div style="background-color: ' + topicColors[i] + ';"></div>' +
+					+ '<div style="background-color: ' + topicColors[i] + ';"></div>'
-					'<span>' + label + '</span>' +
+					+ '<span>' + label + '</span>'
-					'</li>';
+					+ '</li>';
 			});
 			legend.translateHtml(html);
 		}

public/src/admin/modules/search.js

@@ -32,15 +32,15 @@ define('admin/modules/search', ['mousetrap'], function (mousetrap) {
 				'$1<span class="search-match">$2</span>$3'
 			);
 
-			return '<li role="presentation" class="result">' +
+			return '<li role="presentation" class="result">'
-				'<a role= "menuitem" href= "' + config.relative_path + '/' + namespace + '" >' +
+				+ '<a role= "menuitem" href= "' + config.relative_path + '/' + namespace + '" >'
-					title +
+					+ title
-					'<br>' + (!results ? '' :
+					+ '<br>' + (!results ? ''
-				('<small><code>' +
+				: ('<small><code>'
-						results +
+						+ results
-					'</small></code>')) +
+					+ '</small></code>'))
-				'</a>' +
+				+ '</a>'
-			'</li>';
+			+ '</li>';
 		}).join('');
 		return html;
 	}

public/src/client/chats/messages.js

@@ -70,8 +70,8 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
 		var lastSpeaker = parseInt(chatContentEl.find('.chat-message').last().attr('data-uid'), 10);
 		var lasttimestamp = parseInt(chatContentEl.find('.chat-message').last().attr('data-timestamp'), 10);
 		if (!Array.isArray(data)) {
-			data.newSet = lastSpeaker !== parseInt(data.fromuid, 10) ||
+			data.newSet = lastSpeaker !== parseInt(data.fromuid, 10)
-				parseInt(data.timestamp, 10) > parseInt(lasttimestamp, 10) + (1000 * 60 * 3);
+				|| parseInt(data.timestamp, 10) > parseInt(lasttimestamp, 10) + (1000 * 60 * 3);
 		}
 
 		messages.parseMessage(data, function (html) {

public/src/client/chats/search.js

@@ -58,10 +58,10 @@ define('forum/chats/search', ['components'], function (components) {
 
 	function displayUser(chatsListEl, userObj) {
 		function createUserImage() {
-			return (userObj.picture ?
+			return (userObj.picture
-				'<img src="' +	userObj.picture + '" title="' +	userObj.username + '" />' :
+				? '<img src="' +	userObj.picture + '" title="' +	userObj.username + '" />'
-				'<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>') +
+				: '<div class="user-icon" style="background-color: ' + userObj['icon:bgColor'] + '">' + userObj['icon:text'] + '</div>')
-				'<i class="fa fa-circle status ' + userObj.status + '"></i> ' + userObj.username;
+				+ '<i class="fa fa-circle status ' + userObj.status + '"></i> ' + userObj.username;
 		}
 
 		var chatEl = $('<li component="chat/search/user" />')

public/src/client/topic/posts.js

@@ -71,8 +71,8 @@ define('forum/topic/posts', [
 		ajaxify.data.pagination.pageCount = Math.max(1, Math.ceil(posts[0].topic.postcount / config.postsPerPage));
 		var direction = config.topicPostSort === 'oldest_to_newest' || config.topicPostSort === 'most_votes' ? 1 : -1;
 
-		var isPostVisible = (ajaxify.data.pagination.currentPage === ajaxify.data.pagination.pageCount && direction === 1) ||
+		var isPostVisible = (ajaxify.data.pagination.currentPage === ajaxify.data.pagination.pageCount && direction === 1)
-							(ajaxify.data.pagination.currentPage === 1 && direction === -1);
+							|| (ajaxify.data.pagination.currentPage === 1 && direction === -1);
 
 		if (isPostVisible) {
 			createNewPosts(data, components.get('post').not('[data-index=0]'), direction, scrollToPost);

public/src/modules/categorySelector.js

@@ -66,4 +66,3 @@ define('categorySelector', ['benchpress', 'translator'], function (Benchpress, t
 
 	return categorySelector;
 });
-

public/src/modules/helpers.js

@@ -42,10 +42,10 @@
 		var properties = item.properties;
 		var loggedIn = data.config ? data.config.loggedIn : false;
 		if (properties) {
-			if ((properties.loggedIn && !loggedIn) ||
+			if ((properties.loggedIn && !loggedIn)
-				(properties.guestOnly && loggedIn) ||
+				|| (properties.guestOnly && loggedIn)
-				(properties.globalMod && !data.isGlobalMod && !data.isAdmin) ||
+				|| (properties.globalMod && !data.isGlobalMod && !data.isAdmin)
-				(properties.adminOnly && !data.isAdmin)) {
+				|| (properties.adminOnly && !data.isAdmin)) {
 				return false;
 			}
 		}
@@ -125,11 +125,11 @@
 		category.children.forEach(function (child) {
 			if (child && !child.isSection) {
 				var link = child.link ? child.link : (relative_path + '/category/' + child.slug);
-				html += '<span class="category-children-item pull-left">' +
+				html += '<span class="category-children-item pull-left">'
-					'<div class="icon pull-left" style="' + generateCategoryBackground(child) + '">' +
+					+ '<div class="icon pull-left" style="' + generateCategoryBackground(child) + '">'
-					'<i class="fa fa-fw ' + child.icon + '"></i>' +
+					+ '<i class="fa fa-fw ' + child.icon + '"></i>'
-					'</div>' +
+					+ '</div>'
-					'<a href="' + link + '"><small>' + child.name + '</small></a></span>';
+					+ '<a href="' + link + '"><small>' + child.name + '</small></a></span>';
 			}
 		});
 		html = html ? ('<span class="category-children">' + html + '</span>') : html;

public/src/modules/iconSelect.js

@@ -117,4 +117,3 @@ define('iconSelect', ['benchpress'], function (Benchpress) {
 
 	return iconSelect;
 });
-

public/src/modules/scrollStop.js

@@ -19,8 +19,8 @@ define('scrollStop', function () {
 			var elementHeight = Math.round(this.getBoundingClientRect().height);
 
 			if (
-				(e.originalEvent.deltaY < 0 && scrollTop === 0) ||							// scroll up
+				(e.originalEvent.deltaY < 0 && scrollTop === 0)							// scroll up
-				(e.originalEvent.deltaY > 0 && (elementHeight + scrollTop) >= scrollHeight)	// scroll down
+				|| (e.originalEvent.deltaY > 0 && (elementHeight + scrollTop) >= scrollHeight)	// scroll down
 			) {
 				return false;
 			}

public/src/modules/taskbar.js

@@ -116,11 +116,11 @@ define('taskbar', ['benchpress', 'translator'], function (Benchpress, translator
 
 			var	taskbarEl = $('<li />')
 				.addClass(data.options.className)
-				.html('<a href="#">' +
+				.html('<a href="#">'
-					(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
+					+ (data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '')
-					(data.options.image ? '<img src="' + data.options.image + '"/> ' : '') +
+					+ (data.options.image ? '<img src="' + data.options.image + '"/> ' : '')
-					'<span component="taskbar/title">' + title + '</span>' +
+					+ '<span component="taskbar/title">' + title + '</span>'
-					'</a>')
+					+ '</a>')
 				.attr({
 					title: title,
 					'data-module': data.module,

public/src/modules/topicList.js

@@ -65,9 +65,9 @@ define('topicList', ['forum/infinitescroll', 'handleBack', 'topicSelect'], funct
 	};
 
 	function onNewTopic(data) {
-		if ((ajaxify.data.selectedCids && ajaxify.data.selectedCids.indexOf(parseInt(data.cid, 10)) === -1) ||
+		if ((ajaxify.data.selectedCids && ajaxify.data.selectedCids.indexOf(parseInt(data.cid, 10)) === -1)
-			(ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.filter === 'watched') ||
+			|| (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.filter === 'watched')
-			(ajaxify.data.template.category && parseInt(ajaxify.data.cid, 10) !== parseInt(data.cid, 10))) {
+			|| (ajaxify.data.template.category && parseInt(ajaxify.data.cid, 10) !== parseInt(data.cid, 10))) {
 			return;
 		}
 
@@ -82,11 +82,11 @@ define('topicList', ['forum/infinitescroll', 'handleBack', 'topicSelect'], funct
 		}
 
 		var post = data.posts[0];
-		if ((!post || !post.topic) ||
+		if ((!post || !post.topic)
-			(parseInt(post.topic.mainPid, 10) === parseInt(post.pid, 10)) ||
+			|| (parseInt(post.topic.mainPid, 10) === parseInt(post.pid, 10))
-			(ajaxify.data.selectedCids && ajaxify.data.selectedCids.indexOf(parseInt(post.topic.cid, 10)) === -1) ||
+			|| (ajaxify.data.selectedCids && ajaxify.data.selectedCids.indexOf(parseInt(post.topic.cid, 10)) === -1)
-			(ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.filter === 'new') ||
+			|| (ajaxify.data.selectedFilter && ajaxify.data.selectedFilter.filter === 'new')
-			(ajaxify.data.template.category && parseInt(ajaxify.data.cid, 10) !== parseInt(post.topic.cid, 10))) {
+			|| (ajaxify.data.template.category && parseInt(ajaxify.data.cid, 10) !== parseInt(post.topic.cid, 10))) {
 			return;
 		}
 

public/src/modules/translator.js

@@ -181,8 +181,8 @@
 						cursor += 1;
 					// a space or comma was found before the name
 					// this isn't a translation string, so back out
-					} else if (!(textBeforeColonFound && colonFound && textAfterColonFound && commaAfterNameFound) &&
+					} else if (!(textBeforeColonFound && colonFound && textAfterColonFound && commaAfterNameFound)
-							invalidTextRegex.test(char0)) {
+							&& invalidTextRegex.test(char0)) {
 						cursor += 1;
 						lastBreak -= 2;
 						// no longer in a token

public/src/utils.js

@@ -625,10 +625,10 @@
 			var rect = el.getBoundingClientRect();
 
 			return (
-				rect.top >= 0 &&
+				rect.top >= 0
-				rect.left >= 0 &&
+				&& rect.left >= 0
-				rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /* or $(window).height() */
+				&& rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) /* or $(window).height() */
-				rect.right <= (window.innerWidth || document.documentElement.clientWidth) /* or $(window).width() */
+				&& rect.right <= (window.innerWidth || document.documentElement.clientWidth) /* or $(window).width() */
 			);
 		},
 
@@ -731,10 +731,10 @@
 		},
 
 		isInternalURI: function (targetLocation, referenceLocation, relative_path) {
-			return targetLocation.host === '' ||	// Relative paths are always internal links
+			return targetLocation.host === ''	// Relative paths are always internal links
-				(
+				|| (
-					targetLocation.host === referenceLocation.host && targetLocation.protocol === referenceLocation.protocol &&	// Otherwise need to check if protocol and host match
+					targetLocation.host === referenceLocation.host && targetLocation.protocol === referenceLocation.protocol	// Otherwise need to check if protocol and host match
-					(relative_path.length > 0 ? targetLocation.pathname.indexOf(relative_path) === 0 : true)	// Subfolder installs need this additional check
+					&& (relative_path.length > 0 ? targetLocation.pathname.indexOf(relative_path) === 0 : true)	// Subfolder installs need this additional check
 				);
 		},
 

src/admin/search.js

@@ -18,10 +18,10 @@ function filterDirectories(directories) {
 		// exclude partials
 		// only include subpaths
 		// exclude category.tpl, group.tpl, category-analytics.tpl
-		return !dir.endsWith('.js') &&
+		return !dir.endsWith('.js')
-			!dir.includes('/partials/') &&
+			&& !dir.includes('/partials/')
-			/\/.*\//.test(dir) &&
+			&& /\/.*\//.test(dir)
-			!/manage\/(category|group|category-analytics)$/.test(dir);
+			&& !/manage\/(category|group|category-analytics)$/.test(dir);
 	});
 }
 
@@ -138,10 +138,10 @@ function initDict(language, callback) {
 						title = '[[admin/menu:general/dashboard]]';
 					} else {
 						title = title.match(/admin\/(.+?)\/(.+?)$/);
-						title = '[[admin/menu:section-' +
+						title = '[[admin/menu:section-'
-							(title[1] === 'development' ? 'advanced' : title[1]) +
+							+ (title[1] === 'development' ? 'advanced' : title[1])
-							']]' + (title[2] ? (' > [[admin/menu:' +
+							+ ']]' + (title[2] ? (' > [[admin/menu:'
-							title[1] + '/' + title[2] + ']]') : '');
+							+ title[1] + '/' + title[2] + ']]') : '');
 					}
 
 					translator.translate(title).then(function (title) {

src/analytics.js

@@ -5,6 +5,7 @@ var async = require('async');
 var winston = require('winston');
 var nconf = require('nconf');
 var crypto = require('crypto');
+var LRU = require('lru-cache');
 
 var db = require('./database');
 var plugins = require('./plugins');
@@ -25,7 +26,6 @@ var uniquevisitors = 0;
  * the cache could be exhausted continuously if there are more than 500 concurrently
  * active users
  */
-var LRU = require('lru-cache');
 var ipCache = LRU({
 	max: 500,
 	length: function () { return 1; },

src/categories/recentreplies.js

@@ -244,4 +244,3 @@ module.exports = function (Categories) {
 		], callback);
 	}
 };
-

src/cli/colors.js

@@ -65,9 +65,9 @@ Command.prototype.usage = function () {
 		return humanReadableArgName(arg);
 	});
 
-	var usage = '[options]'[optionColor] +
+	var usage = '[options]'[optionColor]
-		(this.commands.length ? ' [command]' : '')[subCommandColor] +
+		+ (this.commands.length ? ' [command]' : '')[subCommandColor]
-		(this._args.length ? ' ' + args.join(' ') : '')[argColor];
+		+ (this._args.length ? ' ' + args.join(' ') : '')[argColor];
 
 	return usage;
 };
@@ -90,10 +90,10 @@ Command.prototype.commandHelp = function () {
 		}).join(' ');
 
 		return [
-			cmd._name[subCommandColor] +
+			cmd._name[subCommandColor]
-				(cmd._alias ? ' | ' + cmd._alias : '')[subCommandColor] +
+				+ (cmd._alias ? ' | ' + cmd._alias : '')[subCommandColor]
-				(cmd.options.length ? ' [options]' : '')[subOptionColor] +
+				+ (cmd.options.length ? ' [options]' : '')[subOptionColor]
-				' ' + args[subArgColor],
+				+ ' ' + args[subArgColor],
 			cmd._description,
 		];
 	});

src/cli/index.js

@@ -65,7 +65,9 @@ try {
 }
 
 require('colors');
+// eslint-disable-next-line
 var nconf = require('nconf');
+// eslint-disable-next-line
 var program = require('commander');
 
 var pkg = require('../../package.json');

src/cli/manage.js

@@ -27,10 +27,10 @@ function buildTargets() {
 		return '     ' + _.padEnd('"' + tuple[0] + '"', length + 2).magenta + '  |  ' + tuple[1];
 	}).join('\n');
 	console.log(
-		'\n\n  Build targets:\n' +
+		'\n\n  Build targets:\n'
-		('\n     ' + _.padEnd('Target', length + 2) + '  |  Aliases').green +
+		+ ('\n     ' + _.padEnd('Target', length + 2) + '  |  Aliases').green
-		'\n     ------------------------------------------------------\n'.blue +
+		+ '\n     ------------------------------------------------------\n'.blue
-		output + '\n'
+		+ output + '\n'
 	);
 }
 

src/cli/upgrade.js

@@ -88,8 +88,8 @@ function runUpgrade(upgrades, options) {
 
 	if (upgrades === true) {
 		var tasks = Object.keys(steps);
-		if (options.package || options.install ||
+		if (options.package || options.install
-				options.plugins || options.schema || options.build) {
+				|| options.plugins || options.schema || options.build) {
 			tasks = tasks.filter(function (key) {
 				return options[key];
 			});

src/controllers/accounts/profile.js

@@ -133,4 +133,3 @@ profileController.get = function (req, res, callback) {
 		},
 	], callback);
 };
-

src/controllers/admin/events.js

@@ -47,4 +47,3 @@ eventsController.get = function (req, res, next) {
 		},
 	], next);
 };
-

src/controllers/admin/hooks.js

@@ -29,4 +29,3 @@ hooksController.get = function (req, res) {
 
 	res.render('admin/advanced/hooks', { hooks: hooks });
 };
-

src/controllers/admin/languages.js

@@ -24,4 +24,3 @@ languagesController.get = function (req, res, next) {
 		},
 	], next);
 };
-

src/controllers/admin/themes.js

@@ -46,4 +46,3 @@ themesController.get = function (req, res, next) {
 		},
 	], next);
 };
-

src/controllers/admin/uploads.js

@@ -317,4 +317,3 @@ function uploadImage(filename, folder, uploadedFile, req, res, next) {
 		res.json([{ name: uploadedFile.name, url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url }]);
 	});
 }
-

src/controllers/index.js

@@ -249,10 +249,10 @@ Controllers.robots = function (req, res) {
 	if (meta.config['robots:txt']) {
 		res.send(meta.config['robots:txt']);
 	} else {
-		res.send('User-agent: *\n' +
+		res.send('User-agent: *\n'
-			'Disallow: ' + nconf.get('relative_path') + '/admin/\n' +
+			+ 'Disallow: ' + nconf.get('relative_path') + '/admin/\n'
-			'Disallow: ' + nconf.get('relative_path') + '/reset/\n' +
+			+ 'Disallow: ' + nconf.get('relative_path') + '/reset/\n'
-			'Sitemap: ' + nconf.get('url') + '/sitemap.xml');
+			+ 'Sitemap: ' + nconf.get('url') + '/sitemap.xml');
 	}
 };
 

src/controllers/mods.js

@@ -184,4 +184,3 @@ modsController.postQueue = function (req, res, next) {
 		},
 	], next);
 };
-

src/controllers/sitemap.js

@@ -54,4 +54,3 @@ function sendSitemap(method, res, callback) {
 		},
 	], callback);
 }
-

src/coverPhoto.js

@@ -1,8 +1,8 @@
 'use strict';
 
 
-var meta = require('./meta');
 var nconf = require('nconf');
+var meta = require('./meta');
 
 var coverPhoto = module.exports;
 

src/groups/cache.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var pubsub = require('../pubsub');
 var LRU = require('lru-cache');
+var pubsub = require('../pubsub');
 
 var cache = LRU({
 	max: 40000,

src/groups/create.js

@@ -77,9 +77,9 @@ module.exports = function (Groups) {
 	};
 
 	function isSystemGroup(data) {
-		return data.system === true || parseInt(data.system, 10) === 1 ||
+		return data.system === true || parseInt(data.system, 10) === 1
-			data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators' ||
+			|| data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators'
-			Groups.isPrivilegeGroup(data.name);
+			|| Groups.isPrivilegeGroup(data.name);
 	}
 
 	function validateGroupName(name, callback) {

src/messaging/data.js

@@ -134,8 +134,8 @@ module.exports = function (Messaging) {
 							Messaging.getMessageFields(mid, ['fromuid', 'timestamp'], next);
 						},
 						function (fields, next) {
-							if ((messages[0].timestamp > fields.timestamp + Messaging.newMessageCutoff) ||
+							if ((messages[0].timestamp > fields.timestamp + Messaging.newMessageCutoff)
-								(messages[0].fromuid !== fields.fromuid)) {
+								|| (messages[0].fromuid !== fields.fromuid)) {
 								// If it's been 5 minutes, this is a new set of messages
 								messages[0].newSet = true;
 							}

src/meta/blacklist.js

@@ -80,9 +80,9 @@ Blacklist.test = function (clientIp, callback) {
 	}
 
 	if (
-		!Blacklist._rules.ipv4.includes(clientIp) &&	// not explicitly specified in ipv4 list
+		!Blacklist._rules.ipv4.includes(clientIp)	// not explicitly specified in ipv4 list
-		!Blacklist._rules.ipv6.includes(clientIp) &&	// not explicitly specified in ipv6 list
+		&& !Blacklist._rules.ipv6.includes(clientIp)	// not explicitly specified in ipv6 list
-		!Blacklist._rules.cidr.some(function (subnet) {
+		&& !Blacklist._rules.cidr.some(function (subnet) {
 			var cidr = ipaddr.parseCIDR(subnet);
 			if (addr.kind() !== cidr[0].kind()) {
 				return false;

src/middleware/header.js

@@ -273,4 +273,3 @@ module.exports = function (middleware) {
 		return title;
 	}
 };
-

src/middleware/headers.js

@@ -61,4 +61,3 @@ module.exports = function (middleware) {
 		next();
 	};
 };
-

src/middleware/render.js

@@ -89,11 +89,11 @@ module.exports = function (middleware) {
 					}, next);
 				},
 				function (results, next) {
-					var str = results.header +
+					var str = results.header
-						(res.locals.postHeader || '') +
+						+ (res.locals.postHeader || '')
-						results.content + '<script id="ajaxify-data"></script>' +
+						+ results.content + '<script id="ajaxify-data"></script>'
-						(res.locals.preFooter || '') +
+						+ (res.locals.preFooter || '')
-						results.footer;
+						+ results.footer;
 
 					translate(str, req, res, next);
 				},

src/plugins/data.js

@@ -106,16 +106,16 @@ function getStaticDirectories(pluginData, callback) {
 
 	async.each(dirs, function (route, next) {
 		if (!validMappedPath.test(route)) {
-			winston.warn('[plugins/' + pluginData.id + '] Invalid mapped path specified: ' +
+			winston.warn('[plugins/' + pluginData.id + '] Invalid mapped path specified: '
-				route + '. Path must adhere to: ' + validMappedPath.toString());
+				+ route + '. Path must adhere to: ' + validMappedPath.toString());
 			return next();
 		}
 
 		var dirPath = path.join(pluginData.path, pluginData.staticDirs[route]);
 		fs.stat(dirPath, function (err, stats) {
 			if (err && err.code === 'ENOENT') {
-				winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' +
+				winston.warn('[plugins/' + pluginData.id + '] Mapped path \''
-					route + ' => ' + dirPath + '\' not found.');
+					+ route + ' => ' + dirPath + '\' not found.');
 				return next();
 			}
 			if (err) {
@@ -123,8 +123,8 @@ function getStaticDirectories(pluginData, callback) {
 			}
 
 			if (!stats.isDirectory()) {
-				winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' +
+				winston.warn('[plugins/' + pluginData.id + '] Mapped path \''
-					route + ' => ' + dirPath + '\' is not a directory.');
+					+ route + ' => ' + dirPath + '\' is not a directory.');
 				return next();
 			}
 
@@ -135,8 +135,8 @@ function getStaticDirectories(pluginData, callback) {
 		if (err) {
 			return callback(err);
 		}
-		winston.verbose('[plugins] found ' + Object.keys(staticDirs).length +
+		winston.verbose('[plugins] found ' + Object.keys(staticDirs).length
-			' static directories for ' + pluginData.id);
+			+ ' static directories for ' + pluginData.id);
 		callback(null, staticDirs);
 	});
 }

src/plugins/hooks.js

@@ -34,10 +34,10 @@ module.exports = function (Plugins) {
 		var method;
 
 		if (Object.keys(Plugins.deprecatedHooks).includes(data.hook)) {
-			winston.warn('[plugins/' + id + '] Hook `' + data.hook + '` is deprecated, ' +
+			winston.warn('[plugins/' + id + '] Hook `' + data.hook + '` is deprecated, '
-				(Plugins.deprecatedHooks[data.hook] ?
+				+ (Plugins.deprecatedHooks[data.hook]
-					'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.' :
+					? 'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.'
-					'there is no alternative.'
+					: 'there is no alternative.'
 				));
 		}
 

src/posts/create.js

@@ -114,4 +114,3 @@ module.exports = function (Posts) {
 		], callback);
 	};
 };
-

src/posts/tools.js

@@ -70,4 +70,3 @@ module.exports = function (Posts) {
 		], callback);
 	};
 };
-

src/privileges/categories.js

@@ -141,8 +141,8 @@ module.exports = function (privileges) {
 			},
 			function (results, next) {
 				cids = cids.filter(function (cid, index) {
-					return !results.categories[index].disabled &&
+					return !results.categories[index].disabled
-						(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+						&& (results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
 				});
 
 				next(null, cids.filter(Boolean));

src/privileges/posts.js

@@ -115,15 +115,15 @@ module.exports = function (privileges) {
 				var isModOf = {};
 				cids = cids.filter(function (cid, index) {
 					isModOf[cid] = results.isModerators[index];
-					return !results.categories[index].disabled &&
+					return !results.categories[index].disabled
-						(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+						&& (results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
 				});
 
 				const cidsSet = new Set(cids);
 
 				pids = postData.filter(function (post) {
-					return post.topic && cidsSet.has(post.topic.cid) &&
+					return post.topic && cidsSet.has(post.topic.cid)
-						((!post.topic.deleted && !post.deleted) || results.isAdmin || isModOf[post.cid]);
+						&& ((!post.topic.deleted && !post.deleted) || results.isAdmin || isModOf[post.cid]);
 				}).map(post => post.pid);
 
 				plugins.fireHook('filter:privileges.posts.filter', {

src/privileges/topics.js

@@ -92,15 +92,15 @@ module.exports = function (privileges) {
 				var isModOf = {};
 				cids = cids.filter(function (cid, index) {
 					isModOf[cid] = results.isModerators[index];
-					return !results.categories[index].disabled &&
+					return !results.categories[index].disabled
-						(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
+						&& (results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
 				});
 
 				const cidsSet = new Set(cids);
 
 				tids = topicsData.filter(function (topic) {
-					return cidsSet.has(topic.cid) &&
+					return cidsSet.has(topic.cid)
-						(!topic.deleted || results.isAdmin || isModOf[topic.cid]);
+						&& (!topic.deleted || results.isAdmin || isModOf[topic.cid]);
 				}).map(topic => topic.tid);
 
 				plugins.fireHook('filter:privileges.topics.filter', {
@@ -144,8 +144,8 @@ module.exports = function (privileges) {
 			},
 			function (results, next) {
 				uids = uids.filter(function (uid, index) {
-					return !results.disabled &&
+					return !results.disabled
-						((results.allowedTo[index] && !topicData.deleted) || results.isAdmins[index] || results.isModerators[index]);
+						&& ((results.allowedTo[index] && !topicData.deleted) || results.isAdmins[index] || results.isModerators[index]);
 				});
 
 				next(null, uids);
@@ -193,9 +193,9 @@ module.exports = function (privileges) {
 
 				var preventTopicDeleteAfterReplies = meta.config.preventTopicDeleteAfterReplies;
 				if (preventTopicDeleteAfterReplies && (topicData.postcount - 1) >= preventTopicDeleteAfterReplies) {
-					var langKey = preventTopicDeleteAfterReplies > 1 ?
+					var langKey = preventTopicDeleteAfterReplies > 1
-						'[[error:cant-delete-topic-has-replies, ' + meta.config.preventTopicDeleteAfterReplies + ']]' :
+						? '[[error:cant-delete-topic-has-replies, ' + meta.config.preventTopicDeleteAfterReplies + ']]'
-						'[[error:cant-delete-topic-has-reply]]';
+						: '[[error:cant-delete-topic-has-reply]]';
 					return next(new Error(langKey));
 				}
 

src/rewards/index.js

@@ -1,9 +1,9 @@
 'use strict';
 
 
+var async = require('async');
 var db = require('../database');
 var plugins = require('../plugins');
-var async = require('async');
 
 var rewards = module.exports;
 

src/routes/api.js

@@ -39,4 +39,3 @@ module.exports = function (app, middleware, controllers) {
 	router.post('/user/:userslug/uploadcover', middlewares.concat([middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadCoverPicture);
 	router.post('/groups/uploadpicture', middlewares.concat([middleware.authenticate]), controllers.groups.uploadCover);
 };
-

src/routes/index.js

@@ -171,8 +171,8 @@ module.exports = function (app, middleware, callback) {
 	// DEPRECATED (v1.12.0)
 	app.use(relativePath + '/assets/stylesheet.css', function (req, res) {
 		if (!warned.has(req.path)) {
-			winston.warn('[deprecated] Accessing `/assets/stylesheet.css` is deprecated to be REMOVED in NodeBB v1.12.0. ' +
+			winston.warn('[deprecated] Accessing `/assets/stylesheet.css` is deprecated to be REMOVED in NodeBB v1.12.0. '
-			'Use `/assets/client.css` to access this file');
+			+ 'Use `/assets/client.css` to access this file');
 			warned.add(req.path);
 		}
 		res.redirect(relativePath + '/assets/client.css?' + meta.config['cache-buster']);

src/sitemap.js

@@ -42,8 +42,8 @@ sitemap.render = function (callback) {
 
 sitemap.getPages = function (callback) {
 	if (
-		sitemap.maps.pages &&
+		sitemap.maps.pages
-		Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10)
+		&& Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10)
 	) {
 		return sitemap.maps.pages.toXML(callback);
 	}
@@ -82,8 +82,8 @@ sitemap.getPages = function (callback) {
 
 sitemap.getCategories = function (callback) {
 	if (
-		sitemap.maps.categories &&
+		sitemap.maps.categories
-		Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10)
+		&& Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10)
 	) {
 		return sitemap.maps.categories.toXML(callback);
 	}
@@ -124,8 +124,8 @@ sitemap.getTopicPage = function (page, callback) {
 	var max = min + numTopics;
 
 	if (
-		sitemap.maps.topics[page - 1] &&
+		sitemap.maps.topics[page - 1]
-		Date.now() < parseInt(sitemap.maps.topics[page - 1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page - 1].cacheResetPeriod, 10)
+		&& Date.now() < parseInt(sitemap.maps.topics[page - 1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page - 1].cacheResetPeriod, 10)
 	) {
 		return sitemap.maps.topics[page - 1].toXML(callback);
 	}

src/social.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var plugins = require('./plugins');
 var db = require('./database');
-var async = require('async');
 
 var social = module.exports;
 

src/socket.io/admin/rewards.js

@@ -10,4 +10,3 @@ SocketRewards.save = function (socket, data, callback) {
 SocketRewards.delete = function (socket, data, callback) {
 	rewardsAdmin.delete(data, callback);
 };
-

src/socket.io/groups.js

@@ -249,10 +249,10 @@ SocketGroups.create = function (socket, data, callback) {
 };
 
 SocketGroups.delete = isOwner(function (socket, data, callback) {
-	if (data.groupName === 'administrators' ||
+	if (data.groupName === 'administrators'
-		data.groupName === 'registered-users' ||
+		|| data.groupName === 'registered-users'
-		data.groupName === 'guests' ||
+		|| data.groupName === 'guests'
-		data.groupName === 'Global Moderators') {
+		|| data.groupName === 'Global Moderators') {
 		return callback(new Error('[[error:not-allowed]]'));
 	}
 

src/socket.io/helpers.js

@@ -70,8 +70,8 @@ function filterTidCidIgnorers(uids, tid, cid, callback) {
 		},
 		function (results, next) {
 			uids = uids.filter(function (uid, index) {
-				return results.topicFollowed[index] ||
+				return results.topicFollowed[index]
-					(!results.topicFollowed[index] && !results.topicIgnored[index] && !results.categoryIgnored[index]);
+					|| (!results.topicFollowed[index] && !results.topicIgnored[index] && !results.categoryIgnored[index]);
 			});
 			next(null, uids);
 		},

src/socket.io/index.js

@@ -259,4 +259,3 @@ Sockets.reqFromSocket = function (socket, payload, event) {
 		headers: headers,
 	};
 };
-

src/socket.io/user/ban.js

@@ -148,4 +148,3 @@ module.exports = function (SocketUser) {
 		], callback);
 	}
 };
-

src/topics/tags.js

@@ -4,9 +4,9 @@
 var async = require('async');
 var validator = require('validator');
 
+var _ = require('lodash');
 var db = require('../database');
 var meta = require('../meta');
-var _ = require('lodash');
 var plugins = require('../plugins');
 var utils = require('../utils');
 var batch = require('../batch');

src/topics/unread.js

@@ -464,9 +464,9 @@ module.exports = function (Topics) {
 			function (results, next) {
 				var cutoff = Topics.unreadCutoff();
 				var result = tids.map(function (tid, index) {
-					var read = !results.tids_unread[index] &&
+					var read = !results.tids_unread[index]
-						(results.topicScores[index] < cutoff ||
+						&& (results.topicScores[index] < cutoff
-						!!(results.userScores[index] && results.userScores[index] >= results.topicScores[index]));
+						|| !!(results.userScores[index] && results.userScores[index] >= results.topicScores[index]));
 					return { tid: tid, read: read, index: index };
 				});
 

src/upgrade.js

@@ -217,4 +217,3 @@ Upgrade.incrementProgress = function (value) {
 	readline.cursorTo(process.stdout, 0);
 	process.stdout.write('    [' + (filled ? new Array(filled).join('#') : '') + new Array(unfilled).join(' ') + '] (' + this.current + '/' + (this.total || '??') + ') ' + percentage + ' ');
 };
-

src/upgrades/1.0.0/chat_room_hashes.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Chat room hashes',

src/upgrades/1.0.0/chat_upgrade.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Upgrading chats',

src/upgrades/1.0.0/social_post_sharing.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Social: Post Sharing',

src/upgrades/1.0.0/theme_to_active_plugins.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Adding theme to active plugins sorted set',

src/upgrades/1.0.0/user_best_posts.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Creating user best post sorted sets',

src/upgrades/1.0.0/users_notvalidated.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Creating users:notvalidated',

src/upgrades/1.1.0/assign_topic_read_privilege.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Giving topics:read privs to any group that was previously allowed to Find & Access Category',

src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Dismiss flags from deleted topics',

src/upgrades/1.1.0/group_title_update.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Group title from settings to user profile',

src/upgrades/1.1.0/separate_upvote_downvote.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Store upvotes/downvotes separately',

src/upgrades/1.1.0/user_post_count_per_tid.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Users post count per tid',

src/upgrades/1.1.1/remove_negative_best_posts.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Removing best posts with negative scores',

src/upgrades/1.1.1/upload_privileges.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Giving upload privileges',

src/upgrades/1.10.0/hash_recent_ip_addresses.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var db = require('../../database');
-var batch = require('../../batch');
 
 var async = require('async');
 var crypto = require('crypto');
 var nconf = require('nconf');
+var batch = require('../../batch');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Hash all IP addresses stored in Recent IPs zset',

src/upgrades/1.10.2/event_filters.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 var batch = require('../../batch');
 
 module.exports = {

src/upgrades/1.10.2/fix_category_post_zsets.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 var batch = require('../../batch');
 
 module.exports = {

src/upgrades/1.10.2/fix_category_topic_zsets.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 var batch = require('../../batch');
 
 module.exports = {

src/upgrades/1.10.2/postgres_sessions.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var db = require('../../database');
 var nconf = require('nconf');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Optimize PostgreSQL sessions',

src/upgrades/1.10.2/upgrade_bans_to_hashes.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 var batch = require('../../batch');
 // var user = require('../../user');
 

src/upgrades/1.10.2/username_email_history.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 var batch = require('../../batch');
 var user = require('../../user');
 

src/upgrades/1.11.0/resize_image_width.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Rename maximumImageWidth to resizeImageWidth',

src/upgrades/1.2.0/category_recent_tids.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Category recent tids',

src/upgrades/1.2.0/edit_delete_deletetopic_privileges.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Granting edit/delete/delete topic on existing categories',

src/upgrades/1.3.0/favourites_to_bookmarks.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Favourites to Bookmarks',

src/upgrades/1.3.0/sorted_sets_for_post_replies.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Sorted sets for post replies',

src/upgrades/1.4.0/global_and_user_language_keys.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Update global and user language keys',

src/upgrades/1.4.0/sorted_set_for_pinned_topics.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var db = require('../../database');
 
 var async = require('async');
 var winston = require('winston');
+var db = require('../../database');
 
 module.exports = {
 	name: 'Sorted set for pinned topics',

src/upgrades/1.4.4/config_urls_update.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Upgrading config urls to use assets route',

src/upgrades/1.4.4/sound_settings.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Update global and user sound settings',

src/upgrades/1.5.0/flags_refactor.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Migrating flags to new schema',

src/upgrades/1.5.0/moderation_history_refactor.js

@@ -1,9 +1,9 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 var batch = require('../../batch');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Update moderation notes to zset',

src/upgrades/1.5.0/post_votes_zset.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'New sorted set posts:votes',

src/upgrades/1.5.0/remove_relative_uploaded_profile_cover.js

@@ -1,9 +1,9 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 var batch = require('../../batch');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Remove relative_path from uploaded profile cover urls',

src/upgrades/1.6.0/clear-stale-digest-template.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var meta = require('../../meta');
 
 var async = require('async');
 var crypto = require('crypto');
+var meta = require('../../meta');
 
 module.exports = {
 	name: 'Clearing stale digest templates that were accidentally saved as custom',

src/upgrades/1.6.0/generate-email-logo.js

@@ -1,12 +1,12 @@
 'use strict';
 
-var image = require('../../image');
-var meta = require('../../meta');
 
 var async = require('async');
 var path = require('path');
 var nconf = require('nconf');
 var fs = require('fs');
+var meta = require('../../meta');
+var image = require('../../image');
 
 module.exports = {
 	name: 'Generate email logo for use in email header',

src/upgrades/1.7.6/update_min_pass_strength.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Revising minimum password strength to 1 (from 0)',

src/upgrades/1.8.1/diffs_zset_to_listhash.js

@@ -1,9 +1,9 @@
 'use strict';
 
+var async = require('async');
 var db = require('../../database');
 const batch = require('../../batch');
 
-var async = require('async');
 
 module.exports = {
 	name: 'Reformatting post diffs to be stored in lists and hash instead of single zset',

src/user/approval.js

@@ -244,11 +244,11 @@ module.exports = function (User) {
 			function (next) {
 				request({
 					method: 'get',
-					url: 'http://api.stopforumspam.org/api' +
+					url: 'http://api.stopforumspam.org/api'
-						'?ip=' + encodeURIComponent(user.ip) +
+						+ '?ip=' + encodeURIComponent(user.ip)
-						'&email=' + encodeURIComponent(user.email) +
+						+ '&email=' + encodeURIComponent(user.email)
-						'&username=' + encodeURIComponent(user.username) +
+						+ '&username=' + encodeURIComponent(user.username)
-						'&f=json',
+						+ '&f=json',
 					json: true,
 				}, next);
 			},

src/user/auth.js

@@ -109,9 +109,9 @@ module.exports = function (User) {
 				var expired;
 
 				sessions = sessions.filter(function (sessionObj, idx) {
-					expired = !sessionObj || !sessionObj.hasOwnProperty('passport') ||
+					expired = !sessionObj || !sessionObj.hasOwnProperty('passport')
-						!sessionObj.passport.hasOwnProperty('user')	||
+						|| !sessionObj.passport.hasOwnProperty('user')
-						parseInt(sessionObj.passport.user, 10) !== parseInt(uid, 10);
+						||	parseInt(sessionObj.passport.user, 10) !== parseInt(uid, 10);
 
 					if (expired) {
 						expiredSids.push(_sids[idx]);