From 47cc1083df8c7239b96cb51d5f138c84837b5b4c Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 28 Jul 2015 15:03:20 -0400
Subject: [PATCH] fix mark all read

---
 src/socket.io/topics.js | 6 +++---
 src/topics/unread.js    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index 6e9cafcf63..06ea14d9d7 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -97,7 +97,7 @@ SocketTopics.postcount = function(socket, tid, callback) {
 };
 
 SocketTopics.markAsRead = function(socket, tids, callback) {
-	if(!Array.isArray(tids) || !socket.uid) {
+	if (!Array.isArray(tids) || !socket.uid) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
@@ -123,14 +123,14 @@ SocketTopics.markAsRead = function(socket, tids, callback) {
 };
 
 SocketTopics.markTopicNotificationsRead = function(socket, tid, callback) {
-	if(!tid || !socket.uid) {
+	if (!tid || !socket.uid) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 	topics.markTopicNotificationsRead(tid, socket.uid);
 };
 
 SocketTopics.markAllRead = function(socket, data, callback) {
-	topics.getLatestTidsFromSet('topics:recent', 0, -1, 'day', function(err, tids) {
+	db.getSortedSetRevRangeByScore('topics:recent', 0, -1, '+inf', Date.now() - topics.unreadCutoff, function(err, tids) {
 		if (err) {
 			return callback(err);
 		}
diff --git a/src/topics/unread.js b/src/topics/unread.js
index b0252d02ce..7abaf5ab4c 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -14,6 +14,8 @@ module.exports = function(Topics) {
 
 	var unreadCutoff = 86400000 * 2;
 
+	Topics.unreadCutoff = unreadCutoff;
+
 	Topics.getTotalUnread = function(uid, callback) {
 		Topics.getUnreadTids(0, uid, 0, 20, function(err, tids) {
 			callback(err, tids ? tids.length : 0);