From eb57276980af0f5fa1c5fabfff0dee5e185c86de Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 4 Jan 2016 15:08:07 +0200
Subject: [PATCH] fix test

---
 src/socket.io/topics/unread.js | 24 ++++++++++++++++++++----
 src/topics/unread.js           |  8 +++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/socket.io/topics/unread.js b/src/socket.io/topics/unread.js
index 18bd862f93..cbcbceacec 100644
--- a/src/socket.io/topics/unread.js
+++ b/src/socket.io/topics/unread.js
@@ -2,10 +2,8 @@
 
 var async = require('async');
 
-var db = require('../../database');
 var user = require('../../user');
 var topics = require('../../topics');
-var utils = require('../../../public/src/utils');
 
 module.exports = function(SocketTopics) {
 
@@ -14,7 +12,17 @@ module.exports = function(SocketTopics) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
-		topics.markAsRead(tids, socket.uid, callback);
+		topics.markAsRead(tids, socket.uid, function(err) {
+			if (err) {
+				return callback(err);
+			}
+
+			Topics.pushUnreadCount(uid);
+
+			for (var i=0; i<tids.length; ++i) {
+				Topics.markTopicNotificationsRead(tids[i], uid);
+			}
+		});
 	};
 
 	SocketTopics.markTopicNotificationsRead = function(socket, tid, callback) {
@@ -25,7 +33,15 @@ module.exports = function(SocketTopics) {
 	};
 
 	SocketTopics.markAllRead = function(socket, data, callback) {
-		topics.markAllRead(socket.uid, callback);
+		topics.markAllRead(socket.uid, function(err) {
+			if (err) {
+				return callback(err);
+			}
+
+			Topics.pushUnreadCount(uid);
+
+			callback();
+		});
 	};
 
 	SocketTopics.markCategoryTopicsRead = function(socket, cid, callback) {
diff --git a/src/topics/unread.js b/src/topics/unread.js
index 253592a6d5..3ea3d5b10c 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -214,11 +214,6 @@ module.exports = function(Topics) {
 				categories.markAsRead(cids, uid, next);
 			},
 			function (next) {
-				Topics.pushUnreadCount(uid);
-
-				for (var i=0; i<tids.length; ++i) {
-					Topics.markTopicNotificationsRead(tids[i], uid);
-				}
 				next(null, true);
 			}
 		], callback);
@@ -230,6 +225,9 @@ module.exports = function(Topics) {
 				db.getSortedSetRevRangeByScore('topics:recent', 0, -1, '+inf', Topics.unreadCutoff(), next);
 			},
 			function (tids, next) {
+				for (var i=0; i<tids.length; ++i) {
+					Topics.markTopicNotificationsRead(tids[i], uid);
+				}
 				Topics.markAsRead(uid, tids, next);
 			},
 			function (markedRead, next) {