From 0a936e5dd18dcf84beae8344e76e1b816c75fe37 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 16 Sep 2014 12:38:27 -0400
Subject: [PATCH] unreadTids

---
 src/database/mongo/helpers.js |   2 +-
 src/groups.js                 |  10 ++--
 src/socket.io/topics.js       |   3 +-
 src/topics/unread.js          | 109 ++++++++++++++++------------------
 4 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/src/database/mongo/helpers.js b/src/database/mongo/helpers.js
index d8e62fb3f1..7a4c160bb8 100644
--- a/src/database/mongo/helpers.js
+++ b/src/database/mongo/helpers.js
@@ -34,6 +34,6 @@ helpers.valueToString = function(value) {
 
 helpers.noop = function() {};
 
-helpers.KEY_LIMIT = 100;
+helpers.KEY_LIMIT = 300;
 
 module.exports = helpers;
\ No newline at end of file
diff --git a/src/groups.js b/src/groups.js
index b4ee1b9c17..2a1587fd98 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -196,15 +196,17 @@
 			if (err) {
 				return callback(err);
 			}
-			groupNames = internals.removeEphemeralGroups(groupNames);
-			if (groupNames.length === 0) {
-				return callback(null, null);
-			}
+
 			var results = [];
 			uids.forEach(function() {
 				results.push(false);
 			});
 
+			groupNames = internals.removeEphemeralGroups(groupNames);
+			if (groupNames.length === 0) {
+				return callback(null, results);
+			}
+
 			async.each(groupNames, function(groupName, next) {
 				Groups.isMembers(uids, groupName, function(err, isMembers) {
 					if (err) {
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index 706c43eaed..44f78efcbe 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -46,9 +46,10 @@ SocketTopics.post = function(socket, data, callback) {
 			if (err) {
 				return;
 			}
+
 			for(var i=0; i<uids.length; ++i) {
 				if (parseInt(uids[i], 10) !== socket.uid) {
-					websockets.in('uid_' + uids[i]).emit('event:new_post', result.postData);
+					websockets.in('uid_' + uids[i]).emit('event:new_post', {posts: result.postData});
 					websockets.in('uid_' + uids[i]).emit('event:new_topic', result.topicData);
 				}
 			}
diff --git a/src/topics/unread.js b/src/topics/unread.js
index 0a282d36b2..fd1849cfdf 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -64,77 +64,55 @@ module.exports = function(Topics) {
 	};
 
 	Topics.getUnreadTids = function(uid, start, stop, callback) {
-		var unreadTids = [],
-			done = false;
-
 		uid = parseInt(uid, 10);
 		if (uid === 0) {
-			return callback(null, unreadTids);
-		}
-
-		var count = 0;
-		if (stop === -1) {
-			count = Infinity;
-		} else {
-			count = stop - start + 1;
+			return callback(null, []);
 		}
 
-		user.getIgnoredCategories(uid, function(err, ignoredCids) {
+		async.parallel({
+			ignoredCids: function(next) {
+				user.getIgnoredCategories(uid, next);
+			},
+			recentTids: function(next) {
+				Topics.getLatestTids(0, -1, 'day', next);
+			}
+		}, function(err, results) {
 			if (err) {
 				return callback(err);
 			}
 
-			async.whilst(function() {
-				return unreadTids.length < count && !done;
-			}, function(next) {
-				Topics.getLatestTids(start, stop, 'day', function(err, tids) {
-					if (err) {
-						return next(err);
-					}
-
-					if (tids && !tids.length) {
-						done = true;
-						return next();
-					}
-
-					Topics.hasReadTopics(tids, uid, function(err, read) {
-						if (err) {
-							return next(err);
-						}
-
-						var newtids = tids.filter(function(tid, index) {
-							return !read[index];
-						});
+			if (results.recentTids && !results.recentTids.length) {
+				return callback(null, []);
+			}
 
-						privileges.topics.filter('read', newtids, uid, function(err, newtids) {
-							if (err) {
-								return next(err);
-							}
+			Topics.hasReadTopics(results.recentTids, uid, function(err, read) {
+				if (err) {
+					return callback(err);
+				}
 
-							filterTopicsFromIgnoredCategories(newtids, ignoredCids, function(err, newtids) {
-								if (err) {
-									return next(err);
-								}
+				var tids = results.recentTids.filter(function(tid, index) {
+					return !read[index];
+				});
 
-								unreadTids.push.apply(unreadTids, newtids);
+				filterTopics(uid, tids, results.ignoredCids, function(err, tids) {
+					if (err) {
+						return callback(err);
+					}
 
-								start = stop + 1;
-								stop = start + 19;
+					if (stop === -1) {
+						tids = tids.slice(start);
+					} else {
+						tids = tids.slice(start, stop + 1);
+					}
 
-								next();
-							});
-						});
-					});
+					callback(err, tids);
 				});
-			}, function(err) {
-				callback(err, unreadTids.slice(0, count));
 			});
-
 		});
 	};
 
-	function filterTopicsFromIgnoredCategories(tids, ignoredCids, callback) {
-		if (!Array.isArray(ignoredCids) || !ignoredCids.length || !tids.length) {
+	function filterTopics(uid, tids, ignoredCids, callback) {
+		if (!Array.isArray(ignoredCids) || !tids.length) {
 			return callback(null, tids);
 		}
 
@@ -146,13 +124,28 @@ module.exports = function(Topics) {
 			if (err) {
 				return callback(err);
 			}
-			topics = topics.filter(function(topic) {
-				return topic && ignoredCids.indexOf(topic.cid.toString()) === -1;
-			}).map(function(topic) {
-				return topic.tid;
+
+			var topicCids = topics.map(function(topic) {
+				return topic && topic.cid.toString();
+			});
+
+			topicCids = topicCids.filter(function(cid) {
+				return ignoredCids.indexOf(cid) === -1;
 			});
 
-			callback(null, topics);
+			privileges.categories.filterCids('read', topicCids, uid, function(err, readableCids) {
+				if (err) {
+					return callback(err);
+				}
+
+				topics = topics.filter(function(topic) {
+					return topic && readableCids.indexOf(topic.cid.toString()) !== -1;
+				}).map(function(topic) {
+					return topic.tid;
+				});
+
+				callback(null, topics);
+			});
 		});
 	}