mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-16 18:56:15 +01:00
closes #5682
This commit is contained in:
@@ -8,9 +8,10 @@ var validator = require('validator');
|
|||||||
var pagination = require('../pagination');
|
var pagination = require('../pagination');
|
||||||
var user = require('../user');
|
var user = require('../user');
|
||||||
var topics = require('../topics');
|
var topics = require('../topics');
|
||||||
|
var plugins = require('../plugins');
|
||||||
var helpers = require('./helpers');
|
var helpers = require('./helpers');
|
||||||
|
|
||||||
var unreadController = {};
|
var unreadController = module.exports;
|
||||||
|
|
||||||
var validFilter = { '': true, new: true, watched: true };
|
var validFilter = { '': true, new: true, watched: true };
|
||||||
|
|
||||||
@@ -19,13 +20,17 @@ unreadController.get = function (req, res, next) {
|
|||||||
var results;
|
var results;
|
||||||
var cid = req.query.cid;
|
var cid = req.query.cid;
|
||||||
var filter = req.params.filter || '';
|
var filter = req.params.filter || '';
|
||||||
|
|
||||||
if (!validFilter[filter]) {
|
|
||||||
return next();
|
|
||||||
}
|
|
||||||
var settings;
|
var settings;
|
||||||
|
|
||||||
async.waterfall([
|
async.waterfall([
|
||||||
function (next) {
|
function (next) {
|
||||||
|
plugins.fireHook('filter:unread.getValidFilters', { filters: validFilter }, next);
|
||||||
|
},
|
||||||
|
function (data, _next) {
|
||||||
|
if (!data.filters[filter]) {
|
||||||
|
return next();
|
||||||
|
}
|
||||||
|
|
||||||
async.parallel({
|
async.parallel({
|
||||||
watchedCategories: function (next) {
|
watchedCategories: function (next) {
|
||||||
helpers.getWatchedCategories(req.uid, cid, next);
|
helpers.getWatchedCategories(req.uid, cid, next);
|
||||||
@@ -33,7 +38,7 @@ unreadController.get = function (req, res, next) {
|
|||||||
settings: function (next) {
|
settings: function (next) {
|
||||||
user.getSettings(req.uid, next);
|
user.getSettings(req.uid, next);
|
||||||
},
|
},
|
||||||
}, next);
|
}, _next);
|
||||||
},
|
},
|
||||||
function (_results, next) {
|
function (_results, next) {
|
||||||
results = _results;
|
results = _results;
|
||||||
@@ -113,5 +118,3 @@ unreadController.unreadTotal = function (req, res, next) {
|
|||||||
res.json(data);
|
res.json(data);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = unreadController;
|
|
||||||
|
|||||||
Reference in New Issue
Block a user