Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4434

Browse Source
This commit is contained in:
barisusakli
2016-05-13 14:08:50 +03:00
parent bf3f19253f
commit 84a7b6690b
8 changed files with 141 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/topics/unread.js
View File

@@ -19,17 +19,13 @@ module.exports = function(Topics) {
callback = filter;
filter = '';
}
Topics.getUnreadTids(0, uid, 0, 99, filter, function(err, tids) {
callback(err, tids ? tids.length : 0);
Topics.getUnreadTids(0, uid, filter, function(err, tids) {
callback(err, Array.isArray(tids) ? tids.length : 0);
});
};
Topics.getUnreadTopics = function(cid, uid, start, stop, filter, callback) {
if (!callback) {
callback = filter;
filter = '';
}
var unreadTopics = {
showSelect: true,
@@ -39,12 +35,21 @@ module.exports = function(Topics) {
async.waterfall([
function(next) {
Topics.getUnreadTids(cid, uid, start, stop, filter, next);
Topics.getUnreadTids(cid, uid, filter, next);
},
function(tids, next) {
unreadTopics.topicCount = tids.length;
if (!tids.length) {
return next(null, []);
}
if (stop === -1) {
tids = tids.slice(start);
} else {
tids = tids.slice(start, stop + 1);
}
Topics.getTopicsByTids(tids, uid, next);
},
function(topicData, next) {
@@ -63,12 +68,7 @@ module.exports = function(Topics) {
return Date.now() - (parseInt(meta.config.unreadCutoff, 10) || 2) * 86400000;
};
Topics.getUnreadTids = function(cid, uid, start, stop, filter, callback) {
if (!callback) {
callback = filter;
filter = '';
}
Topics.getUnreadTids = function(cid, uid, filter, callback) {
uid = parseInt(uid, 10);
if (uid === 0) {
return callback(null, []);
@@ -136,19 +136,9 @@ module.exports = function(Topics) {
},
function (tids, next) {
tids = tids.slice(0, 100);
tids = tids.slice(0, 200);
filterTopics(uid, tids, cid, ignoredCids, next);
},
function (tids, next) {
if (stop === -1) {
tids = tids.slice(start);
} else {
tids = tids.slice(start, stop + 1);
}
next(null, tids);
}
], callback);
};