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

unread changes

Browse Source
This commit is contained in:
barisusakli
2014-09-27 17:41:49 -04:00
parent 80ca6bb0a2
commit 5fc760c6c4
4 changed files with 76 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/forum/infinitescroll.js
View File

@@ -15,9 +15,9 @@ define('forum/infinitescroll', function() {
topOffset = _topOffest || 0; topOffset = _topOffest || 0;
$(window).off('scroll', onScroll).on('scroll', onScroll); $(window).off('scroll', onScroll).on('scroll', onScroll);
if ($(document).height() === $(window).height()) { // if ($(document).height() === $(window).height()) {
callback(1); // callback(1);
} // }
}; };
function onScroll() { function onScroll() {

26
src/database/mongo/sorted.js
View File

@@ -136,14 +136,18 @@ module.exports = function(db, module) {
}; };
module.getSortedSetRangeByScore = function(key, start, count, min, max, callback) { module.getSortedSetRangeByScore = function(key, start, count, min, max, callback) {
getSortedSetRangeByScore(key, start, count, min, max, 1, callback); getSortedSetRangeByScore(key, start, count, min, max, 1, false, callback);
}; };
module.getSortedSetRevRangeByScore = function(key, start, count, max, min, callback) { module.getSortedSetRevRangeByScore = function(key, start, count, max, min, callback) {
getSortedSetRangeByScore(key, start, count, min, max, -1, callback); getSortedSetRangeByScore(key, start, count, min, max, -1, false, callback);
}; };
function getSortedSetRangeByScore(key, start, count, min, max, sort, callback) { module.getSortedSetRevRangeByScoreWithScores = function(key, start, count, max, min, callback) {
getSortedSetRangeByScore(key, start, count, min, max, -1, true, callback);
};
function getSortedSetRangeByScore(key, start, count, min, max, sort, withScores, callback) {
if (!key) { if (!key) {
return callback(); return callback();
} }
@@ -159,7 +163,13 @@ module.exports = function(db, module) {
scoreQuery['$lte'] = max; scoreQuery['$lte'] = max;
} }
db.collection('objects').find({_key:key, score: scoreQuery}, {fields:{value:1}}) var fields = {_id: 0};
fields['value'] = 1;
if (withScores) {
fields['score'] = 1;
}
db.collection('objects').find({_key:key, score: scoreQuery}, {fields: fields})
.limit(count) .limit(count)
.skip(start) .skip(start)
.sort({score: sort}) .sort({score: sort})
@@ -168,9 +178,11 @@ module.exports = function(db, module) {
return callback(err); return callback(err);
} }
data = data.map(function(item) { if (!withScores) {
return item.value; data = data.map(function(item) {
}); return item.value;
});
}
callback(err, data); callback(err, data);
}); });

4
src/database/redis/sorted.js
View File

@@ -98,6 +98,10 @@ module.exports = function(redisClient, module) {
redisClient.zrevrangebyscore([key, max, min, 'LIMIT', start, count], callback); redisClient.zrevrangebyscore([key, max, min, 'LIMIT', start, count], callback);
}; };
module.getSortedSetRevRangeByScoreWithScores = function(key, start, count, max, min, callback) {
redisClient.zrevrangebyscore([key, max, min, 'WITHSCORES', 'LIMIT', start, count], callback);
};
module.sortedSetCount = function(key, min, max, callback) { module.sortedSetCount = function(key, min, max, callback) {
redisClient.zcount(key, min, max, callback); redisClient.zcount(key, min, max, callback);
}; };

88
src/topics/unread.js
View File

@@ -69,12 +69,17 @@ module.exports = function(Topics) {
return callback(null, []); return callback(null, []);
} }
var yesterday = Date.now() - 86400000;
async.parallel({ async.parallel({
ignoredCids: function(next) { ignoredCids: function(next) {
user.getIgnoredCategories(uid, next); user.getIgnoredCategories(uid, next);
}, },
recentTids: function(next) { recentTids: function(next) {
Topics.getLatestTids(0, -1, 'day', next); db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, Infinity, yesterday, next);
},
userScores: function(next) {
db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, Infinity, yesterday, next);
} }
}, function(err, results) { }, function(err, results) {
if (err) { if (err) {
@@ -85,28 +90,30 @@ module.exports = function(Topics) {
return callback(null, []); return callback(null, []);
} }
Topics.hasReadTopics(results.recentTids, uid, function(err, read) { var userRead = {};
results.userScores.forEach(function(userItem) {
userRead[userItem.value] = userItem.score;
});
var tids = results.recentTids.filter(function(recentTopic, index) {
return !userRead[recentTopic.value] || recentTopic.score > userRead[recentTopic.value];
}).map(function(topic) {
return topic.value;
});
filterTopics(uid, tids, results.ignoredCids, function(err, tids) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var tids = results.recentTids.filter(function(tid, index) { if (stop === -1) {
return !read[index]; tids = tids.slice(start);
}); } else {
tids = tids.slice(start, stop + 1);
}
filterTopics(uid, tids, results.ignoredCids, function(err, tids) { callback(err, tids);
if (err) {
return callback(err);
}
if (stop === -1) {
tids = tids.slice(start);
} else {
tids = tids.slice(start, stop + 1);
}
callback(err, tids);
});
}); });
}); });
}; };
@@ -167,12 +174,7 @@ module.exports = function(Topics) {
}; };
Topics.markAsUnreadForAll = function(tid, callback) { Topics.markAsUnreadForAll = function(tid, callback) {
db.delete('tid:' + tid + ':read_by_uid', function(err) { Topics.markCategoryUnreadForAll(tid, callback);
if(err) {
return callback(err);
}
Topics.markCategoryUnreadForAll(tid, callback);
});
}; };
Topics.markAsRead = function(tids, uid, callback) { Topics.markAsRead = function(tids, uid, callback) {
@@ -181,13 +183,15 @@ module.exports = function(Topics) {
return callback(); return callback();
} }
tids = tids.filter(Boolean); tids = tids.filter(Boolean);
var keys = tids.map(function(tid) {
return 'tid:' + tid + ':read_by_uid'; var now = Date.now();
var scores = tids.map(function(tid) {
return now;
}); });
async.parallel({ async.parallel({
markRead: function(next) { markRead: function(next) {
db.setsAdd(keys, uid, next); db.sortedSetAdd('uid:' + uid + ':tids_read', scores, tids, next);
}, },
topicData: function(next) { topicData: function(next) {
Topics.getTopicsFields(tids, ['cid'], next); Topics.getTopicsFields(tids, ['cid'], next);
@@ -238,21 +242,29 @@ module.exports = function(Topics) {
})); }));
} }
var sets = []; async.parallel({
recentScores: function(next) {
db.sortedSetScores('topics:recent', tids, next);
},
userScores: function(next) {
db.sortedSetScores('uid:' + uid + ':tids_read', tids, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var result = tids.map(function(tid, index) {
return !!(results.userScores[index] && results.userScores[index] >= results.recentScores[index]);
});
for (var i = 0, ii = tids.length; i < ii; i++) { callback(null, result);
sets.push('tid:' + tids[i] + ':read_by_uid'); });
}
db.isMemberOfSets(sets, uid, callback);
}; };
Topics.hasReadTopic = function(tid, uid, callback) { Topics.hasReadTopic = function(tid, uid, callback) {
if(!parseInt(uid, 10)) { Topics.hasReadTopics([tid], uid, function(err, hasRead) {
return callback(null, false); callback(err, Array.isArray(hasRead) && hasRead.length ? hasRead[0] : false);
} });
db.isSetMember('tid:' + tid + ':read_by_uid', uid, callback);
}; };