From 1a87767c2c52a39e90af786d76783bfff30ba11d Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 27 Jan 2016 20:36:40 +0200
Subject: [PATCH] removed extra isAdminOrMod check

---
 src/categories/topics.js               | 74 ++++++++++++--------------
 src/controllers/category.js            |  3 ++
 src/controllers/topics.js              |  2 +-
 src/routes/feeds.js                    |  2 +-
 src/socket.io/categories.js            |  2 +
 src/socket.io/topics/infinitescroll.js |  2 +-
 src/topics/posts.js                    |  2 +-
 7 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/categories/topics.js b/src/categories/topics.js
index 07a7d99596..9edc388f52 100644
--- a/src/categories/topics.js
+++ b/src/categories/topics.js
@@ -5,57 +5,49 @@ var async = require('async');
 var db = require('../database');
 var topics = require('../topics');
 var plugins = require('../plugins');
-var privileges = require('../privileges');
 
 module.exports = function(Categories) {
 
 	Categories.getCategoryTopics = function(data, callback) {
-		async.parallel({
-			isAdminOrMod: function(next) {
-				privileges.categories.isAdminOrMod(data.cid, data.uid, next);
+		async.waterfall([
+			function (next) {
+				plugins.fireHook('filter:category.topics.prepare', data, next);
 			},
-			topics: function(next) {
-				async.waterfall([
-					function(next) {
-						plugins.fireHook('filter:category.topics.prepare', data, next);
-					},
-					function(data, next) {
-						Categories.getTopicIds(data.set, data.reverse, data.start, data.stop, next);
-					},
-					function(tids, next) {
-						topics.getTopicsByTids(tids, data.uid, next);
-					},
-					function(topics, next) {
-						if (!Array.isArray(topics) || !topics.length) {
-							return next(null, {topics: [], uid: data.uid});
-						}
+			function (data, next) {
+				Categories.getTopicIds(data.set, data.reverse, data.start, data.stop, next);
+			},
+			function (tids, next) {
+				topics.getTopicsByTids(tids, data.uid, next);
+			},
+			function (topics, next) {
+				if (!Array.isArray(topics) || !topics.length) {
+					return next(null, {topics: [], uid: data.uid});
+				}
 
-						for (var i=0; i<topics.length; ++i) {
-							topics[i].index = data.start + i;
-						}
+				for (var i=0; i<topics.length; ++i) {
+					topics[i].index = data.start + i;
+				}
 
-						plugins.fireHook('filter:category.topics.get', {topics: topics, uid: data.uid}, next);
-					},
-					function(results, next) {
-						next(null, results.topics);
-					}
-				], next);
-			}
-		}, function(err, results) {
-			if (err) {
-				return callback(err);
+				plugins.fireHook('filter:category.topics.get', {topics: topics, uid: data.uid}, next);
+			},
+			function (results, next) {
+				next(null, {topics: results.topics, nextStart: data.stop + 1});
 			}
+		], callback);
+	};
 
-			results.topics.forEach(function(topic) {
-				if (!(!topic.deleted || results.isAdminOrMod || topic.isOwner)) {
-					topic.title = '[[topic:topic_is_deleted]]';
-					topic.slug = topic.tid;
-					topic.teaser = null;
-					topic.noAnchor = true;
-				}
-			});
+	Categories.modifyTopicsByPrivilege = function(topics, privileges) {
+		if (!Array.isArray(topics) || !topics.length || privileges.isAdminOrMod) {
+			return;
+		}
 
-			callback(null, {topics: results.topics, nextStart: data.stop + 1});
+		topics.forEach(function(topic) {
+			if (topic.deleted && !topic.isOwner) {
+				topic.title = '[[topic:topic_is_deleted]]';
+				topic.slug = topic.tid;
+				topic.teaser = null;
+				topic.noAnchor = true;
+			}
 		});
 	};
 
diff --git a/src/controllers/category.js b/src/controllers/category.js
index 45ff8ba467..5e24553ff6 100644
--- a/src/controllers/category.js
+++ b/src/controllers/category.js
@@ -111,6 +111,9 @@ categoryController.get = function(req, res, callback) {
 			categories.getCategoryById(payload, next);
 		},
 		function (categoryData, next) {
+
+			categories.modifyTopicsByPrivilege(categoryData.topics, userPrivileges);
+
 			if (categoryData.link) {
 				db.incrObjectField('category:' + categoryData.cid, 'timesClicked');
 				return res.redirect(categoryData.link);
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index f959b2de38..8ab9f470c4 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -116,7 +116,7 @@ topicsController.get = function(req, res, callback) {
 				return callback();
 			}
 
-			topics.modifyByPrivilege(topicData.posts, userPrivileges);
+			topics.modifyPostsByPrivilege(topicData.posts, userPrivileges);
 
 			plugins.fireHook('filter:controllers.topic.get', {topicData: topicData, uid: req.uid}, next);
 		},
diff --git a/src/routes/feeds.js b/src/routes/feeds.js
index 924280238e..b71fc99aab 100644
--- a/src/routes/feeds.js
+++ b/src/routes/feeds.js
@@ -49,7 +49,7 @@ function generateForTopic(req, res, callback) {
 			return callback(err);
 		}
 
-		topics.modifyByPrivilege(topicData.posts, userPrivileges);
+		topics.modifyPostsByPrivilege(topicData.posts, userPrivileges);
 
 		var description = topicData.posts.length ? topicData.posts[0].content : '';
 		var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js
index 736d534f82..7e8b6000f3 100644
--- a/src/socket.io/categories.js
+++ b/src/socket.io/categories.js
@@ -119,6 +119,8 @@ SocketCategories.loadMore = function(socket, data, callback) {
 				return callback(err);
 			}
 
+			categories.modifyTopicsByPrivilege(data.topics, results.privileges);
+
 			data.privileges = results.privileges;
 			data.template = {
 				category: true,
diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js
index c34c97c8cb..8cb975c15e 100644
--- a/src/socket.io/topics/infinitescroll.js
+++ b/src/socket.io/topics/infinitescroll.js
@@ -81,7 +81,7 @@ module.exports = function(SocketTopics) {
 				topicData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
 				topicData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
 
-				topics.modifyByPrivilege(topicData.posts, results.privileges);
+				topics.modifyPostsByPrivilege(topicData.posts, results.privileges);
 				callback(null, topicData);
 			});
 		});
diff --git a/src/topics/posts.js b/src/topics/posts.js
index 3ee333bd55..64f9fd1392 100644
--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@@ -138,7 +138,7 @@ module.exports = function(Topics) {
 		});
 	};
 
-	Topics.modifyByPrivilege = function(postData, topicPrivileges) {
+	Topics.modifyPostsByPrivilege = function(postData, topicPrivileges) {
 		postData.forEach(function(post) {
 			if (post) {
 				post.display_moderator_tools = topicPrivileges.isAdminOrMod || post.selfPost;