From 9797f6932452ecc8763a03107d7d3eb88c88be15 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 12 Jan 2017 11:48:41 -0500
Subject: [PATCH 1/3] action:chat.sent

---
 public/src/client/chats/messages.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js
index 1ac8e2a2ff..3cb8328847 100644
--- a/public/src/client/chats/messages.js
+++ b/public/src/client/chats/messages.js
@@ -21,6 +21,12 @@ define('forum/chats/messages', ['components', 'sounds', 'translator'], function
 		inputEl.val('');
 		inputEl.removeAttr('data-mid');
 
+		$(window).trigger('action:chat.sent', {
+			roomId: roomId,
+			message: msg,
+			mid: mid
+		});
+		
 		if (!mid) {
 			socket.emit('modules.chats.send', {
 				roomId: roomId,
@@ -145,4 +151,4 @@ define('forum/chats/messages', ['components', 'sounds', 'translator'], function
 	};
 
 	return messages;
-});
\ No newline at end of file
+});

From 2a9088d571d3422a1c42779e9a0a566938e56309 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 12 Jan 2017 15:55:46 -0500
Subject: [PATCH 2/3] updating checkGlobalPrivacySettings middleware to hook
 into write-api for auth

---
 src/middleware/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middleware/user.js b/src/middleware/user.js
index 4b4af39c5f..c2c3bd9dd6 100644
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@@ -15,7 +15,7 @@ module.exports = function (middleware) {
 
 	middleware.checkGlobalPrivacySettings = function (req, res, next) {
 		if (!req.user && !!parseInt(meta.config.privateUserInfo, 10)) {
-			return controllers.helpers.notAllowed(req, res);
+			return middleware.authenticate(req, res, next);
 		}
 
 		next();

From c99321a5185652ba4118a20f5773a7eca60bfecb Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 13 Jan 2017 15:01:14 -0500
Subject: [PATCH 3/3] always setting app.previousUrl now, and passing cid into
 filter:category.topics.get hook

---
 public/src/ajaxify.js    | 4 +---
 src/categories/topics.js | 2 +-
 src/topics/tools.js      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 2e895f380b..bc5a1b8bb5 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -67,9 +67,7 @@ $(document).ready(function () {
 			apiXHR.abort();
 		}
 
-		if (!window.location.pathname.match(/\/(403|404)$/g)) {
-			app.previousUrl = window.location.href;
-		}
+		app.previousUrl = window.location.href;
 
 		url = ajaxify.start(url);
 
diff --git a/src/categories/topics.js b/src/categories/topics.js
index 1459bca531..9e477e51ef 100644
--- a/src/categories/topics.js
+++ b/src/categories/topics.js
@@ -28,7 +28,7 @@ module.exports = function (Categories) {
 					topics[i].index = data.start + i;
 				}
 
-				plugins.fireHook('filter:category.topics.get', {topics: topics, uid: data.uid}, next);
+				plugins.fireHook('filter:category.topics.get', {cid: data.cid, topics: topics, uid: data.uid}, next);
 			},
 			function (results, next) {
 				next(null, {topics: results.topics, nextStart: data.stop + 1});
diff --git a/src/topics/tools.js b/src/topics/tools.js
index c69b0692ab..cccffa8c75 100644
--- a/src/topics/tools.js
+++ b/src/topics/tools.js
@@ -272,7 +272,7 @@ module.exports = function (Topics) {
 				db.sortedSetsRemove([
 					'cid:' + topicData.cid + ':tids',
 					'cid:' + topicData.cid + ':tids:pinned',
-					'cid:' + topicData.cid + ':tids:posts'
+					'cid:' + topicData.cid + ':tids:posts'	// post count
 				], tid, next);
 			},
 			function (next) {