From 32257c9b2f35334837404dd69d575e2d08fb634c Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 16 Sep 2014 11:06:10 -0400
Subject: [PATCH] updateUnreadCount

---
 public/src/forum/footer.js | 16 ++++++++++++++++
 src/socket.io/posts.js     |  3 +--
 src/socket.io/topics.js    |  5 ++---
 src/topics/unread.js       | 36 ++++++++----------------------------
 src/user.js                |  4 ++--
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index e7e8209a1b..c983e0a834 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -24,6 +24,22 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat)
 			.attr('data-content', count > 20 ? '20+' : count);
 	}
 
+	function onNewPost(data) {
+		if (data && data.posts && data.posts.length) {
+			var post = data.posts[0];
+			if (parseInt(post.uid, 10) !== parseInt(app.uid, 10)) {
+				increaseUnreadCount();
+			}
+		}
+	}
+
+	function increaseUnreadCount() {
+		var count = parseInt($('#unread-count').attr('data-content'), 10) + 1;
+		updateUnreadTopicCount(null, count);
+	}
+
+
+	socket.on('event:new_post', onNewPost);
 
 	socket.on('event:unread.updateCount', updateUnreadTopicCount);
 	socket.emit('user.getUnreadCount', updateUnreadTopicCount);
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index 582e3fa7c9..e7d5e330d3 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -51,14 +51,13 @@ SocketPosts.reply = function(socket, data, callback) {
 				return;
 			}
 			for(var i=0; i<uids.length; ++i) {
-				if (uids[i] !== socket.uid) {
+				if (parseInt(uids[i], 10) !== socket.uid) {
 					websockets.in('uid_' + uids[i]).emit('event:new_post', result);
 				}
 			}
 		});
 
 		websockets.emitTopicPostStats();
-		topics.pushUnreadCount();
 	});
 };
 
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index db4c100109..706c43eaed 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -47,7 +47,7 @@ SocketTopics.post = function(socket, data, callback) {
 				return;
 			}
 			for(var i=0; i<uids.length; ++i) {
-				if (uids[i] !== socket.uid) {
+				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_topic', result.topicData);
 				}
@@ -55,7 +55,6 @@ SocketTopics.post = function(socket, data, callback) {
 		});
 
 		websockets.emitTopicPostStats();
-		topics.pushUnreadCount();
 	});
 };
 
@@ -188,7 +187,7 @@ SocketTopics.markAsUnreadForAll = function(socket, tids, callback) {
 						if(err) {
 							return next(err);
 						}
-						topics.pushUnreadCount();
+						topics.pushUnreadCount(socket.uid);
 						next();
 					});
 				});
diff --git a/src/topics/unread.js b/src/topics/unread.js
index b25fd83bd6..46e045fb2a 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -156,38 +156,18 @@ module.exports = function(Topics) {
 		});
 	}
 
-	Topics.pushUnreadCount = function(uids, callback) {
-		if (typeof callback === 'function') {
-			return callback(null);
-		} else {
-		    return null;
-		}
-
-		var	websockets = require('./../socket.io');
+	Topics.pushUnreadCount = function(uid, callback) {
+		callback = callback || function() {}:
 
-		if (!uids) {
-			uids = websockets.getConnectedClients();
-		} else if (!Array.isArray(uids)) {
-			uids = [uids];
+		if (!uid || parseInt(uid, 10) === 0) {
+			return callback();
 		}
-
-		uids = uids.filter(function(value) {
-			return parseInt(value, 10) !== 0;
-		});
-
-		async.eachLimit(uids, 5, function(uid, next) {
-			Topics.getTotalUnread(uid, function(err, count) {
-				websockets.in('uid_' + uid).emit('event:unread.updateCount', null, count);
-				next();
-			});
-		}, function(err) {
+		Topics.getTotalUnread(uid, function(err, count) {
 			if (err) {
-				winston.error(err.message);
-			}
-
-			if (callback) {
-				callback();
+				return callback(err);
 			}
+			require('../socket.io').in('uid_' + uid).emit('event:unread.updateCount', null, count);
+			callback();
 		});
 	};
 
diff --git a/src/user.js b/src/user.js
index cb119a7e45..d34a826268 100644
--- a/src/user.js
+++ b/src/user.js
@@ -135,8 +135,8 @@ var
 
 	User.updateLastOnlineTime = function(uid, callback) {
 		callback = callback || function() {};
-		User.getUserField(uid, 'status', function(err, status) {
-			if(err || status === 'offline') {
+		User.getUserFields(uid, ['status', 'lastonline'], function(err, userData) {
+			if(err || userData.status === 'offline' || Date.now() - parseInt(userData.lastonline, 10) < 300000) {
 				return callback(err);
 			}