Merge branch 'fix-some-code-lint' of https://github.com/HeeL/NodeBB into HeeL-fix-some-code-lint

This commit is contained in:
Julian Lam
2016-10-13 14:43:28 -04:00
388 changed files with 6787 additions and 6790 deletions

View File

@@ -13,20 +13,20 @@ var flagsController = {};
var itemsPerPage = 20;
flagsController.get = function(req, res, next) {
flagsController.get = function (req, res, next) {
var byUsername = req.query.byUsername || '';
var cid = req.query.cid || 0;
var sortBy = req.query.sortBy || 'count';
var page = parseInt(req.query.page, 10) || 1;
async.parallel({
categories: function(next) {
categories: function (next) {
categories.buildForSelect(req.uid, next);
},
flagData: function(next) {
flagData: function (next) {
getFlagData(req, res, next);
},
analytics: function(next) {
analytics: function (next) {
analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30, next);
},
assignees: async.apply(user.getAdminsandGlobalModsandModerators)
@@ -36,7 +36,7 @@ flagsController.get = function(req, res, next) {
}
// Minimise data set for assignees so tjs does less work
results.assignees = results.assignees.map(function(userObj) {
results.assignees = results.assignees.map(function (userObj) {
return {
uid: userObj.uid,
username: userObj.username
@@ -52,7 +52,7 @@ flagsController.get = function(req, res, next) {
var pageCount = Math.max(1, Math.ceil(results.flagData.count / itemsPerPage));
results.categories.forEach(function(category) {
results.categories.forEach(function (category) {
category.selected = parseInt(category.cid, 10) === parseInt(cid, 10);
});
@@ -82,14 +82,14 @@ function getFlagData(req, res, callback) {
var sets = [sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged'];
async.waterfall([
function(next) {
function (next) {
if (byUsername) {
user.getUidByUsername(byUsername, next);
} else {
process.nextTick(next, null, 0);
}
},
function(uid, next) {
function (uid, next) {
if (uid) {
sets.push('uid:' + uid + ':flag:pids');
}