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

unread/recent changes closes #4774

Browse Source
This commit is contained in:
barisusakli
2016-11-03 13:06:21 +03:00
parent 6b23dd574e
commit fb47bf3889
8 changed files with 171 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/controllers/unread.js
View File

@@ -5,8 +5,6 @@ var async = require('async');
var querystring = require('querystring');
var validator = require('validator');
var categories = require('../categories');
var privileges = require('../privileges');
var pagination = require('../pagination');
var user = require('../user');
var topics = require('../topics');
@@ -30,7 +28,7 @@ unreadController.get = function (req, res, next) {
function (next) {
async.parallel({
watchedCategories: function (next) {
getWatchedCategories(req.uid, cid, next);
helpers.getWatchedCategories(req.uid, cid, next);
},
settings: function (next) {
user.getSettings(req.uid, next);
@@ -82,9 +80,9 @@ unreadController.get = function (req, res, next) {
filter: 'watched'
}];
data.selectedFilter = data.filters.filter(function (filter) {
data.selectedFilter = data.filters.find(function (filter) {
return filter && filter.selected;
})[0];
});
data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : '';
@@ -92,51 +90,6 @@ unreadController.get = function (req, res, next) {
});
};
function getWatchedCategories(uid, selectedCid, callback) {
async.waterfall([
function (next) {
user.getWatchedCategories(uid, next);
},
function (cids, next) {
privileges.categories.filterCids('read', cids, uid, next);
},
function (cids, next) {
categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'link', 'color', 'bgColor', 'parentCid'], next);
},
function (categoryData, next) {
categoryData = categoryData.filter(function (category) {
return category && !category.link;
});
var selectedCategory;
categoryData.forEach(function (category) {
category.selected = parseInt(category.cid, 10) === parseInt(selectedCid, 10);
if (category.selected) {
selectedCategory = category;
}
});
var categoriesData = [];
var tree = categories.getTree(categoryData, 0);
tree.forEach(function (category) {
recursive(category, categoriesData, '');
});
next(null, {categories: categoriesData, selectedCategory: selectedCategory});
}
], callback);
}
function recursive(category, categoriesData, level) {
category.level = level;
categoriesData.push(category);
category.children.forEach(function (child) {
recursive(child, categoriesData, '    ' + level);
});
}
unreadController.unreadTotal = function (req, res, next) {
var filter = req.params.filter || '';