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

closes #1936

Browse Source
This commit is contained in:
barisusakli
2014-08-15 18:11:57 -04:00
parent d852f284da
commit 522fda2e58
6 changed files with 85 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/topics/unread.js
View File

@@ -4,10 +4,11 @@
var async = require('async'),
winston = require('winston'),
db = require('./../database'),
user = require('./../user'),
notifications = require('./../notifications'),
categories = require('./../categories'),
db = require('../database'),
user = require('../user'),
meta = require('../meta'),
notifications = require('../notifications'),
categories = require('../categories'),
privileges = require('../privileges');
module.exports = function(Topics) {
@@ -27,8 +28,14 @@ module.exports = function(Topics) {
return callback(null, unreadTids);
}
var count = 0;
if (stop === -1) {
count = Infinity;
} else {
count = stop - start + 1;
}
async.whilst(function() {
return unreadTids.length < 21 && !done;
return unreadTids.length < count && !done;
}, function(next) {
Topics.getLatestTids(start, stop, 'month', function(err, tids) {
if (err) {
@@ -49,19 +56,21 @@ module.exports = function(Topics) {
return !read[index];
});
unreadTids.push.apply(unreadTids, newtids);
privileges.topics.filter('read', newtids, uid, function(err, newtids) {
if (err) {
return next(err);
}
unreadTids.push.apply(unreadTids, newtids);
start = stop + 1;
stop = start + 19;
start = stop + 1;
stop = start + 19;
next();
next();
});
});
});
}, function(err) {
if (err) {
return callback(err);
}
privileges.topics.filter('read', unreadTids, uid, callback);
callback(err, unreadTids.slice(0, count));
});
};
@@ -162,7 +171,6 @@ module.exports = function(Topics) {
};
Topics.markAsRead = function(tid, uid, callback) {
db.setAdd('tid:' + tid + ':read_by_uid', uid, function(err) {
if (err) {
return callback(err);