Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 02:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to a named filter for unread to allow future expansion.

Browse Source 
Don't use the query string as it is not passed to infinite scroll.
This commit is contained in:
Ben Lubar
2016-04-08 13:42:47 -05:00
parent a61d947295
commit 217f0c5652
4 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/unread.js
View File

@@ -12,11 +12,17 @@ var plugins = require('../plugins');
var unreadController = {};
var validFilter = {'': true, 'new': true};
unreadController.get = function(req, res, next) {
var stop = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
var results;
var cid = req.query.cid;
var seen = !req.query.unseen;
var filter = req.params.filter || '';
if (!validFilter[filter]) {
return next();
}
async.waterfall([
function(next) {
@@ -25,7 +31,7 @@ unreadController.get = function(req, res, next) {
user.getWatchedCategories(req.uid, next);
},
unreadTopics: function(next) {
topics.getUnreadTopics(cid, req.uid, 0, stop, seen, next);
topics.getUnreadTopics(cid, req.uid, 0, stop, filter, next);
}
}, next);
},
@@ -65,7 +71,13 @@ unreadController.get = function(req, res, next) {
unreadController.unreadTotal = function(req, res, next) {
topics.getTotalUnread(req.uid, !req.query.unseen, function (err, data) {
var filter = req.params.filter || '';
if (!validFilter[filter]) {
return next();
}
topics.getTotalUnread(req.uid, filter, function (err, data) {
if (err) {
return next(err);
}