From 4ce8e2224a7255052be1b55897aa8bf12c3080e0 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 19 Sep 2016 23:43:50 +0300
Subject: [PATCH] optimize topics.markTopicNotificationsRead

let's not call it once for each tid
---
 public/src/client/topic/events.js |  2 +-
 src/controllers/topics.js         |  2 +-
 src/socket.io/topics/unread.js    | 11 +++++------
 src/topics/unread.js              | 24 ++++++++++++++----------
 src/user/notifications.js         |  6 +++---
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 68a864198e..4d8434adb8 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -220,7 +220,7 @@ define('forum/topic/events', [
 	function onNewNotification(data) {
 		var tid = ajaxify.data.tid;
 		if (data && data.tid && parseInt(data.tid, 10) === parseInt(tid, 10)) {
-			socket.emit('topics.markTopicNotificationsRead', tid);
+			socket.emit('topics.markTopicNotificationsRead', [tid]);
 		}
 	}
 
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index 9d106a85f2..d017f1d5c8 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -283,7 +283,7 @@ topicsController.get = function(req, res, callback) {
 				}
 				if (markedRead) {
 					topics.pushUnreadCount(req.uid);
-					topics.markTopicNotificationsRead(tid, req.uid);
+					topics.markTopicNotificationsRead([tid], req.uid);
 				}
 			});
 		}
diff --git a/src/socket.io/topics/unread.js b/src/socket.io/topics/unread.js
index a5582d6892..e9279d3f4a 100644
--- a/src/socket.io/topics/unread.js
+++ b/src/socket.io/topics/unread.js
@@ -19,18 +19,17 @@ module.exports = function(SocketTopics) {
 
 			topics.pushUnreadCount(socket.uid);
 
-			for (var i=0; i<tids.length; ++i) {
-				topics.markTopicNotificationsRead(tids[i], socket.uid);
-			}
+			topics.markTopicNotificationsRead(tids, socket.uid);
+
 			callback();
 		});
 	};
 
-	SocketTopics.markTopicNotificationsRead = function(socket, tid, callback) {
-		if (!tid || !socket.uid) {
+	SocketTopics.markTopicNotificationsRead = function(socket, tids, callback) {
+		if (!Array.isArray(tids) || !socket.uid) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
-		topics.markTopicNotificationsRead(tid, socket.uid);
+		topics.markTopicNotificationsRead(tids, socket.uid);
 	};
 
 	SocketTopics.markAllRead = function(socket, data, callback) {
diff --git a/src/topics/unread.js b/src/topics/unread.js
index 61fef8b65e..d1c2a0bb15 100644
--- a/src/topics/unread.js
+++ b/src/topics/unread.js
@@ -279,9 +279,7 @@ 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.markTopicNotificationsRead(tids, uid);
 				Topics.markAsRead(tids, uid, next);
 			},
 			function (markedRead, next) {
@@ -290,17 +288,23 @@ module.exports = function(Topics) {
 		], callback);
 	};
 
-	Topics.markTopicNotificationsRead = function(tid, uid) {
-		if (!tid) {
+	Topics.markTopicNotificationsRead = function(tids, uid) {
+		if (!Array.isArray(tids) || !tids.length) {
 			return;
 		}
-		user.notifications.getUnreadByField(uid, 'tid', tid, function(err, nids) {
+
+		async.waterfall([
+			function(next) {
+				user.notifications.getUnreadByField(uid, 'tid', tids, next);
+			},
+			function(nids, next) {
+				notifications.markReadMultiple(nids, uid, next);
+			}
+		], function(err) {
 			if (err) {
-				return winston.error(err.stack);
+				return winston.error(err);
 			}
-			notifications.markReadMultiple(nids, uid, function() {
-				user.notifications.pushCount(uid);
-			});
+			user.notifications.pushCount(uid);
 		});
 	};
 
diff --git a/src/user/notifications.js b/src/user/notifications.js
index b08cb6aaff..dcc7d3eee3 100644
--- a/src/user/notifications.js
+++ b/src/user/notifications.js
@@ -154,7 +154,7 @@ var privileges = require('../privileges');
 		});
 	};
 
-	UserNotifications.getUnreadByField = function(uid, field, value, callback) {
+	UserNotifications.getUnreadByField = function(uid, field, values, callback) {
 		db.getSortedSetRevRange('uid:' + uid + ':notifications:unread', 0, 99, function(err, nids) {
 			if (err) {
 				return callback(err);
@@ -173,9 +173,9 @@ var privileges = require('../privileges');
 					return callback(err);
 				}
 
-				value = value ? value.toString() : '';
+				values = values.map(function() { return values.toString(); });
 				nids = notifications.filter(function(notification) {
-					return notification && notification[field] && notification[field].toString() === value;
+					return notification && notification[field] && values.indexOf(notification[field].toString()) !== -1;
 				}).map(function(notification) {
 					return notification.nid;
 				});