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

closes #2773

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-03-24 13:10:10 -04:00
parent d39c2924e4
commit c7b5cd48ba
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/topics/unread.js
View File

@@ -12,6 +12,8 @@ var async = require('async'),
module.exports = function(Topics) { module.exports = function(Topics) {
var unreadCutoff = 86400000;
Topics.getTotalUnread = function(uid, callback) { Topics.getTotalUnread = function(uid, callback) {
Topics.getUnreadTids(uid, 0, 20, function(err, tids) { Topics.getUnreadTids(uid, 0, 20, function(err, tids) {
callback(err, tids ? tids.length : 0); callback(err, tids ? tids.length : 0);
@@ -54,17 +56,17 @@ module.exports = function(Topics) {
return callback(null, []); return callback(null, []);
} }
var yesterday = Date.now() - 86400000; var cutoff = Date.now() - unreadCutoff;
async.parallel({ async.parallel({
ignoredCids: function(next) { ignoredCids: function(next) {
user.getIgnoredCategories(uid, next); user.getIgnoredCategories(uid, next);
}, },
recentTids: function(next) { recentTids: function(next) {
db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', yesterday, next); db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', cutoff, next);
}, },
userScores: function(next) { userScores: function(next) {
db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', yesterday, next); db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', cutoff, next);
} }
}, function(err, results) { }, function(err, results) {
if (err) { if (err) {
@@ -247,8 +249,9 @@ module.exports = function(Topics) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var cutoff = Date.now() - unreadCutoff;
var result = tids.map(function(tid, index) { var result = tids.map(function(tid, index) {
return !!(results.userScores[index] && results.userScores[index] >= results.recentScores[index]); return results.recentScores[index] < cutoff || !!(results.userScores[index] && results.userScores[index] >= results.recentScores[index]);
}); });
callback(null, result); callback(null, result);