From 89bb11a58c4236c0697adeb19ef727b5d2a43195 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Jul 2014 12:56:34 -0400
Subject: [PATCH] closes #1880

---
 public/src/modules/chat.js   |  2 +-
 src/database/level/sorted.js | 15 ++++++++++++++-
 src/database/mongo/sorted.js | 16 ++++++++++++++++
 src/database/redis/sorted.js | 16 ++++++++++++++++
 src/messaging.js             | 12 ++++++++++--
 5 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index cce8a14c0d..4eb25b108d 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -37,7 +37,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
 
 				for(var x = 0; x<chats.length; ++x) {
 					userObj = chats[x];
-					$('<li />')
+					$('<li class="' + (userObj.unread ? 'unread' : '') + '"/>')
 						.attr('data-uid', userObj.uid)
 						.html('<a href="javascript:app.openChat(\'' +
 							userObj.username +
diff --git a/src/database/level/sorted.js b/src/database/level/sorted.js
index d06ee49206..6909a2bdfc 100644
--- a/src/database/level/sorted.js
+++ b/src/database/level/sorted.js
@@ -70,7 +70,7 @@ module.exports = function(db, module) {
 			}
 			set.sort(function(a, b) {return b.score - a.score;});
 			callback(null, set);
-		})
+		});
 	};
 
 	module.getSortedSetRangeByScore = function(key, start, count, min, max, callback) {
@@ -162,6 +162,19 @@ module.exports = function(db, module) {
 		});
 	};
 
+	module.isSortedSetMembers = function(key, values, callback) {
+		module.getListRange(key, 0, -1, function(err, list) {
+			list = list.map(function(item) {
+				return item.value;
+			});
+			values = values.map(function(value) {
+				return list.indexOf(value.toString()) !== -1;
+			});
+
+			callback(err, values);
+		});
+	};
+
 	module.sortedSetsScore = function(keys, value, callback) {
 		var sets = {};
 		async.each(keys, function(key, next) {
diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js
index be66e5c354..161ad56c17 100644
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@@ -132,6 +132,22 @@ module.exports = function(db, module) {
 		});
 	};
 
+	module.isSortedSetMembers = function(key, values, callback) {
+		values = values.map(helpers.valueToString);
+		db.collection('objects').find({_key: key, value: {$in: values}}).toArray(function(err, results) {
+
+
+			results = results.map(function(item) {
+				return item.value;
+			});
+			values = values.map(function(value) {
+				return results.indexOf(value) !== -1;
+			});
+			console.log(err, values);
+			callback(err, results);
+		});
+	};
+
 	module.sortedSetsScore = function(keys, value, callback) {
 		value = helpers.valueToString(value);
 		db.collection('objects').find({_key:{$in:keys}, value: value}).toArray(function(err, result) {
diff --git a/src/database/redis/sorted.js b/src/database/redis/sorted.js
index b388eee16e..166de8da0c 100644
--- a/src/database/redis/sorted.js
+++ b/src/database/redis/sorted.js
@@ -68,6 +68,22 @@ module.exports = function(redisClient, module) {
 		});
 	};
 
+	module.isSortedSetMembers = function(key, values, callback) {
+		var multi = redisClient.multi();
+		for (var i=0; i<values.length; ++i) {
+			multi.zscore(key, values[i]);
+		}
+		multi.exec(function(err, results) {
+			if (err) {
+				return callback(err);
+			}
+			results = results.map(function(score) {
+				return !!score;
+			});
+			callback(null, results);
+		});
+	};
+
 	module.sortedSetsScore = function(keys, value, callback) {
 		multi('zscore', keys, value, callback);
 	};
diff --git a/src/messaging.js b/src/messaging.js
index c7577b1a43..86bece3cdc 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -145,12 +145,20 @@ var db = require('./database'),
 				return callback(err);
 			}
 
-			user.getMultipleUserFields(uids, ['username', 'picture', 'uid'], function(err, users) {
+			async.parallel({
+				unreadUids: async.apply(db.isSortedSetMembers, 'uid:' + uid + ':chats:unread', uids),
+				users: async.apply(user.getMultipleUserFields, uids, ['username', 'picture', 'uid'])
+			}, function(err, results) {
 				if (err) {
 					return callback(err);
 				}
+				var users = results.users;
 
-				users = users.filter(function(user) {
+				for (var i=0; i<users.length; ++i) {
+					users[i].unread = results.unreadUids[i];
+				}
+
+				users = users.filter(function(user, index) {
 					return !!user.uid;
 				});