unread changes

public/src/forum/infinitescroll.js

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

src/database/mongo/sorted.js

@@ -136,14 +136,18 @@ module.exports = function(db, module) {
 	};
 
 	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) {
-		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) {
 			return callback();
 		}
@@ -159,7 +163,13 @@ module.exports = function(db, module) {
 			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)
 			.skip(start)
 			.sort({score: sort})
@@ -168,9 +178,11 @@ module.exports = function(db, module) {
 					return callback(err);
 				}
 
-				data = data.map(function(item) {
-					return item.value;
-				});
+				if (!withScores) {
+					data = data.map(function(item) {
+						return item.value;
+					});
+				}
 
 				callback(err, data);
 			});

src/database/redis/sorted.js

@@ -98,6 +98,10 @@ module.exports = function(redisClient, module) {
 		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) {
 		redisClient.zcount(key, min, max, callback);
 	};

src/topics/unread.js

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