Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 03:27:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* chore: #6599, linting 😬
This commit is contained in:
renovate[bot]
2018-11-07 15:53:14 -05:00
committed by Julian Lam
parent eb0a322d7f
commit 64b9dabff8
109 changed files with 287 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/admin/search.js
View File

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

2
src/analytics.js
View File

@@ -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; },

1
src/categories/recentreplies.js
View File

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

14
src/cli/colors.js
View File

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

2
src/cli/index.js
View File

@@ -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');

8
src/cli/manage.js
View File

@@ -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 ' + _.padEnd('Target', length + 2) + ' | Aliases').green +
'\n ------------------------------------------------------\n'.blue +
output + '\n'
'\n\n Build targets:\n'
+ ('\n ' + _.padEnd('Target', length + 2) + ' | Aliases').green
+ '\n ------------------------------------------------------\n'.blue
+ output + '\n'
);
}

4
src/cli/upgrade.js
View File

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

1
src/controllers/accounts/profile.js
View File

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

1
src/controllers/admin/events.js
View File

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

1
src/controllers/admin/hooks.js
View File

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

1
src/controllers/admin/languages.js
View File

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

1
src/controllers/admin/themes.js
View File

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

1
src/controllers/admin/uploads.js
View File

@@ -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 }]);
});
}

8
src/controllers/index.js
View File

@@ -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' +
'Disallow: ' + nconf.get('relative_path') + '/admin/\n' +
'Disallow: ' + nconf.get('relative_path') + '/reset/\n' +
'Sitemap: ' + nconf.get('url') + '/sitemap.xml');
res.send('User-agent: *\n'
+ 'Disallow: ' + nconf.get('relative_path') + '/admin/\n'
+ 'Disallow: ' + nconf.get('relative_path') + '/reset/\n'
+ 'Sitemap: ' + nconf.get('url') + '/sitemap.xml');
}
};

1
src/controllers/mods.js
View File

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

1
src/controllers/sitemap.js
View File

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

2
src/coverPhoto.js
View File

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

2
src/groups/cache.js
View File

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

6
src/groups/create.js
View File

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

4
src/messaging/data.js
View File

@@ -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) ||
(messages[0].fromuid !== fields.fromuid)) {
if ((messages[0].timestamp > fields.timestamp + Messaging.newMessageCutoff)
|| (messages[0].fromuid !== fields.fromuid)) {
// If it's been 5 minutes, this is a new set of messages
messages[0].newSet = true;
}

6
src/meta/blacklist.js
View File

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

1
src/middleware/header.js
View File

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

1
src/middleware/headers.js
View File

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

10
src/middleware/render.js
View File

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

16
src/plugins/data.js
View File

@@ -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: ' +
route + '. Path must adhere to: ' + validMappedPath.toString());
winston.warn('[plugins/' + pluginData.id + '] Invalid mapped path specified: '
+ 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 \'' +
route + ' => ' + dirPath + '\' not found.');
winston.warn('[plugins/' + pluginData.id + '] Mapped path \''
+ 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 \'' +
route + ' => ' + dirPath + '\' is not a directory.');
winston.warn('[plugins/' + pluginData.id + '] Mapped path \''
+ 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 +
' static directories for ' + pluginData.id);
winston.verbose('[plugins] found ' + Object.keys(staticDirs).length
+ ' static directories for ' + pluginData.id);
callback(null, staticDirs);
});
}

8
src/plugins/hooks.js
View File

@@ -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, ' +
(Plugins.deprecatedHooks[data.hook] ?
'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.' :
'there is no alternative.'
winston.warn('[plugins/' + id + '] Hook `' + data.hook + '` is deprecated, '
+ (Plugins.deprecatedHooks[data.hook]
? 'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.'
: 'there is no alternative.'
));
}

1
src/posts/create.js
View File

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

1
src/posts/tools.js
View File

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

4
src/privileges/categories.js
View File

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

8
src/privileges/posts.js
View File

@@ -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 &&
(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
return !results.categories[index].disabled
&& (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) &&
((!post.topic.deleted && !post.deleted) || results.isAdmin || isModOf[post.cid]);
return post.topic && cidsSet.has(post.topic.cid)
&& ((!post.topic.deleted && !post.deleted) || results.isAdmin || isModOf[post.cid]);
}).map(post => post.pid);
plugins.fireHook('filter:privileges.posts.filter', {

18
src/privileges/topics.js
View File

@@ -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 &&
(results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
return !results.categories[index].disabled
&& (results.allowedTo[index] || results.isAdmin || results.isModerators[index]);
});
const cidsSet = new Set(cids);
tids = topicsData.filter(function (topic) {
return cidsSet.has(topic.cid) &&
(!topic.deleted || results.isAdmin || isModOf[topic.cid]);
return cidsSet.has(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 &&
((results.allowedTo[index] && !topicData.deleted) || results.isAdmins[index] || results.isModerators[index]);
return !results.disabled
&& ((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 ?
'[[error:cant-delete-topic-has-replies, ' + meta.config.preventTopicDeleteAfterReplies + ']]' :
'[[error:cant-delete-topic-has-reply]]';
var langKey = preventTopicDeleteAfterReplies > 1
? '[[error:cant-delete-topic-has-replies, ' + meta.config.preventTopicDeleteAfterReplies + ']]'
: '[[error:cant-delete-topic-has-reply]]';
return next(new Error(langKey));
}

2
src/rewards/index.js
View File

@@ -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;

1
src/routes/api.js
View File

@@ -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);
};

4
src/routes/index.js
View File

@@ -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. ' +
'Use `/assets/client.css` to access this file');
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');
warned.add(req.path);
}
res.redirect(relativePath + '/assets/client.css?' + meta.config['cache-buster']);

12
src/sitemap.js
View File

@@ -42,8 +42,8 @@ sitemap.render = function (callback) {
sitemap.getPages = function (callback) {
if (
sitemap.maps.pages &&
Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10)
sitemap.maps.pages
&& 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 &&
Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10)
sitemap.maps.categories
&& 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] &&
Date.now() < parseInt(sitemap.maps.topics[page - 1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page - 1].cacheResetPeriod, 10)
sitemap.maps.topics[page - 1]
&& 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);
}

2
src/social.js
View File

@@ -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;

1
src/socket.io/admin/rewards.js
View File

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

8
src/socket.io/groups.js
View File

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

4
src/socket.io/helpers.js
View File

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

1
src/socket.io/index.js
View File

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

1
src/socket.io/user/ban.js
View File

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

2
src/topics/tags.js
View File

@@ -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');

6
src/topics/unread.js
View File

@@ -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] &&
(results.topicScores[index] < cutoff ||
!!(results.userScores[index] && results.userScores[index] >= results.topicScores[index]));
var read = !results.tids_unread[index]
&& (results.topicScores[index] < cutoff
|| !!(results.userScores[index] && results.userScores[index] >= results.topicScores[index]));
return { tid: tid, read: read, index: index };
});

1
src/upgrade.js
View File

@@ -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 + ' ');
};

2
src/upgrades/1.0.0/chat_room_hashes.js
View File

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

2
src/upgrades/1.0.0/chat_upgrade.js
View File

@@ -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',

2
src/upgrades/1.0.0/social_post_sharing.js
View File

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

2
src/upgrades/1.0.0/theme_to_active_plugins.js
View File

@@ -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',

2
src/upgrades/1.0.0/user_best_posts.js
View File

@@ -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',

2
src/upgrades/1.0.0/users_notvalidated.js
View File

@@ -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',

2
src/upgrades/1.1.0/assign_topic_read_privilege.js
View File

@@ -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',

2
src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js
View File

@@ -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',

2
src/upgrades/1.1.0/group_title_update.js
View File

@@ -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',

2
src/upgrades/1.1.0/separate_upvote_downvote.js
View File

@@ -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',

2
src/upgrades/1.1.0/user_post_count_per_tid.js
View File

@@ -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',

2
src/upgrades/1.1.1/remove_negative_best_posts.js
View File

@@ -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',

2
src/upgrades/1.1.1/upload_privileges.js
View File

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

4
src/upgrades/1.10.0/hash_recent_ip_addresses.js
View File

@@ -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',

2
src/upgrades/1.10.2/event_filters.js
View File

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

2
src/upgrades/1.10.2/fix_category_post_zsets.js
View File

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

2
src/upgrades/1.10.2/fix_category_topic_zsets.js
View File

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

2
src/upgrades/1.10.2/postgres_sessions.js
View File

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

2
src/upgrades/1.10.2/upgrade_bans_to_hashes.js
View File

@@ -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');

2
src/upgrades/1.10.2/username_email_history.js
View File

@@ -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');

2
src/upgrades/1.11.0/resize_image_width.js
View File

@@ -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',

2
src/upgrades/1.2.0/category_recent_tids.js
View File

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

2
src/upgrades/1.2.0/edit_delete_deletetopic_privileges.js
View File

@@ -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',

2
src/upgrades/1.3.0/favourites_to_bookmarks.js
View File

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

2
src/upgrades/1.3.0/sorted_sets_for_post_replies.js
View File

@@ -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',

2
src/upgrades/1.4.0/global_and_user_language_keys.js
View File

@@ -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',

2
src/upgrades/1.4.0/sorted_set_for_pinned_topics.js
View File

@@ -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',

2
src/upgrades/1.4.4/config_urls_update.js
View File

@@ -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',

2
src/upgrades/1.4.4/sound_settings.js
View File

@@ -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',

2
src/upgrades/1.5.0/flags_refactor.js
View File

@@ -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',

2
src/upgrades/1.5.0/moderation_history_refactor.js
View File

@@ -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',

2
src/upgrades/1.5.0/post_votes_zset.js
View File

@@ -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',

2
src/upgrades/1.5.0/remove_relative_uploaded_profile_cover.js
View File

@@ -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',

2
src/upgrades/1.6.0/clear-stale-digest-template.js
View File

@@ -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',

4
src/upgrades/1.6.0/generate-email-logo.js
View File

@@ -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',

2
src/upgrades/1.7.6/update_min_pass_strength.js
View File

@@ -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)',

2
src/upgrades/1.8.1/diffs_zset_to_listhash.js
View File

@@ -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',

10
src/user/approval.js
View File

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

6
src/user/auth.js
View File

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

4
src/user/create.js
View File

@@ -1,14 +1,14 @@
'use strict';
var async = require('async');
var validator = require('validator');
var zxcvbn = require('zxcvbn');
var db = require('../database');
var utils = require('../utils');
var validator = require('validator');
var plugins = require('../plugins');
var groups = require('../groups');
var meta = require('../meta');
var zxcvbn = require('zxcvbn');
module.exports = function (User) {
User.create = function (data, callback) {

1
src/user/jobs.js
View File

@@ -63,4 +63,3 @@ module.exports = function (User) {
}
};
};

3
src/webserver.js
View File

@@ -20,6 +20,7 @@ var favicon = require('serve-favicon');
var detector = require('spider-detector');
var helmet = require('helmet');
var Benchpress = require('benchpressjs');
var db = require('./database');
var file = require('./file');
var emailer = require('./emailer');
@@ -30,7 +31,6 @@ var plugins = require('./plugins');
var flags = require('./flags');
var routes = require('./routes');
var auth = require('./routes/authentication');
var Benchpress = require('benchpressjs');
var helpers = require('../public/src/modules/helpers');
@@ -353,4 +353,3 @@ module.exports.testSocket = function (socketPath, callback) {
async.apply(fs.unlink, socketPath), // The socket was stale, kick it out of the way
], callback);
};

8
src/widgets/index.js
View File

@@ -39,10 +39,10 @@ widgets.render = function (uid, options, callback) {
}
async.map(widgetsByLocation[location], function (widget, next) {
if (!widget || !widget.data ||
(!!widget.data['hide-registered'] && uid !== 0) ||
(!!widget.data['hide-guests'] && uid === 0) ||
(!!widget.data['hide-mobile'] && options.req.useragent.isMobile)) {
if (!widget || !widget.data
|| (!!widget.data['hide-registered'] && uid !== 0)
|| (!!widget.data['hide-guests'] && uid === 0)
|| (!!widget.data['hide-mobile'] && options.req.useragent.isMobile)) {
return next();
}