getTopicWithPosts change, fix feeds

src/controllers/topics.js

@@ -36,12 +36,12 @@ topicsController.get = function(req, res, callback) {
 					user.getSettings(req.uid, next);
 				},
 				topic: function(next) {
-					topics.getTopicFields(tid, ['slug', 'postcount', 'deleted'], next);
+					topics.getTopicData(tid, next);
 				}
 			}, next);
 		},
 		function (results, next) {
-			if (!results.topic.slug) {
+			if (!results.topic) {
 				return callback();
 			}
 
@@ -106,26 +106,19 @@ topicsController.get = function(req, res, callback) {
 				currentPage = Math.max(1, Math.ceil(index / settings.postsPerPage));
 			}
 
-			var start = (currentPage - 1) * settings.postsPerPage + postIndex,
+			var start = (currentPage - 1) * settings.postsPerPage + postIndex;
-				stop = start + settings.postsPerPage - 1;
+			var stop = start + settings.postsPerPage - 1;
 
-			topics.getTopicWithPosts(tid, set, req.uid, start, stop, reverse, function (err, topicData) {
+			topics.getTopicWithPosts(results.topic, set, req.uid, start, stop, reverse, next);
-				if (err && err.message === '[[error:no-topic]]' && !topicData) {
+		},
-					return callback();
+		function (topicData, next) {
-				}
+			if (topicData.category.disabled) {
+				return callback();
+			}
 
-				if (err && !topicData) {
+			topics.modifyByPrivilege(topicData.posts, userPrivileges);
-					return next(err);
-				}
 
-				if (topicData.category.disabled) {
+			plugins.fireHook('filter:controllers.topic.get', {topicData: topicData, uid: req.uid}, next);
-					return callback();
-				}
-
-				topics.modifyByPrivilege(topicData.posts, results.privileges);
-
-				plugins.fireHook('filter:controllers.topic.get', {topicData: topicData, uid: req.uid}, next);
-			});
 		},
 		function (data, next) {
 

src/routes/feeds.js

@@ -1,116 +1,108 @@
 "use strict";
 
-var async = require('async'),
+var async = require('async');
-	rss = require('rss'),
+var rss = require('rss');
-	nconf = require('nconf'),
+var nconf = require('nconf');
 
-	posts = require('../posts'),
+var posts = require('../posts');
-	topics = require('../topics'),
+var topics = require('../topics');
-	user = require('../user'),
+var user = require('../user');
-	categories = require('../categories'),
+var categories = require('../categories');
-	meta = require('../meta'),
+var meta = require('../meta');
-	helpers = require('../controllers/helpers'),
+var helpers = require('../controllers/helpers');
-	privileges = require('../privileges');
+var privileges = require('../privileges');
 
-function hasTopicPrivileges(req, res, next) {
-	var tid = req.params.topic_id;
 
-	hasPrivileges(privileges.topics.can, tid, req, res, next);
+function generateForTopic(req, res, callback) {
-}
-
-function hasCategoryPrivileges(req, res, next) {
-	var cid = req.params.category_id;
-
-	hasPrivileges(privileges.categories.can, cid, req, res, next);
-}
-
-function hasPrivileges(method, id, req, res, next) {
-	method('read', id, req.uid, function(err, canRead) {
-		if (err) {
-			return next(err);
-		}
-
-		if (!canRead) {
-			return helpers.notAllowed(req, res);
-		}
-
-		return next();
-	});
-}
-
-function generateForTopic(req, res, next) {
 	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
-		return next();
+		return callback();
 	}
 
 	var tid = req.params.topic_id;
-
+	var userPrivileges;
-	privileges.topics.get(tid, req.uid, function(err, userPrivileges) {
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				privileges: function(next) {
+					privileges.topics.get(tid, req.uid, next);
+				},
+				topic: function(next) {
+					topics.getTopicData(tid, next);
+				}
+			}, next);
+		},
+		function (results, next) {
+			if (!results.topic) {
+				return callback();
+			}
+			if (parseInt(results.topic.deleted, 10) && !results.privileges.view_deleted) {
+				return callback();
+			}
+			if (!results.privileges.read) {
+				return helpers.notAllowed(req, res);
+			}
+			userPrivileges = results.privileges;
+			topics.getTopicWithPosts(results.topic, 'tid:' + tid + ':posts', req.uid, 0, 25, false, next);
+		}
+	], function(err, topicData) {
 		if (err) {
-			return next(err);
+			return callback(err);
 		}
 
-		topics.getTopicWithPosts(tid, 'tid:' + tid + ':posts', req.uid, 0, 25, false, function (err, topicData) {
+		topics.modifyByPrivilege(topicData.posts, userPrivileges);
-			if (err) {
+
-				return next(err);
+		var description = topicData.posts.length ? topicData.posts[0].content : '';
+		var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
+		var author = topicData.posts.length ? topicData.posts[0].username : '';
+
+		var feed = new rss({
+				title: topicData.title,
+				description: description,
+				feed_url: nconf.get('url') + '/topic/' + tid + '.rss',
+				site_url: nconf.get('url') + '/topic/' + topicData.slug,
+				image_url: image_url,
+				author: author,
+				ttl: 60
+			}),
+			dateStamp;
+
+		if (topicData.posts.length > 0) {
+			feed.pubDate = new Date(parseInt(topicData.posts[0].timestamp, 10)).toUTCString();
+		}
+
+		topicData.posts.forEach(function(postData) {
+			if (!postData.deleted) {
+				dateStamp = new Date(parseInt(parseInt(postData.edited, 10) === 0 ? postData.timestamp : postData.edited, 10)).toUTCString();
+
+				feed.item({
+					title: 'Reply to ' + topicData.title + ' on ' + dateStamp,
+					description: postData.content,
+					url: nconf.get('url') + '/topic/' + topicData.slug + (postData.index ? '/' + (postData.index + 1) : ''),
+					author: postData.user ? postData.user.username : '',
+					date: dateStamp
+				});
 			}
-
-			if (topicData.deleted && !userPrivileges.view_deleted) {
-				return next();
-			}
-
-			topics.modifyByPrivilege(topicData.posts, userPrivileges);
-
-			var description = topicData.posts.length ? topicData.posts[0].content : '';
-			var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
-			var author = topicData.posts.length ? topicData.posts[0].username : '';
-
-			var feed = new rss({
-					title: topicData.title,
-					description: description,
-					feed_url: nconf.get('url') + '/topic/' + tid + '.rss',
-					site_url: nconf.get('url') + '/topic/' + topicData.slug,
-					image_url: image_url,
-					author: author,
-					ttl: 60
-				}),
-				dateStamp;
-
-			if (topicData.posts.length > 0) {
-				feed.pubDate = new Date(parseInt(topicData.posts[0].timestamp, 10)).toUTCString();
-			}
-
-			topicData.posts.forEach(function(postData) {
-				if (!postData.deleted) {
-					dateStamp = new Date(parseInt(parseInt(postData.edited, 10) === 0 ? postData.timestamp : postData.edited, 10)).toUTCString();
-
-					feed.item({
-						title: 'Reply to ' + topicData.title + ' on ' + dateStamp,
-						description: postData.content,
-						url: nconf.get('url') + '/topic/' + topicData.slug + (postData.index ? '/' + (postData.index + 1) : ''),
-						author: postData.user ? postData.user.username : '',
-						date: dateStamp
-					});
-				}
-			});
-
-			sendFeed(feed, res);
 		});
+
+		sendFeed(feed, res);
 	});
 }
 
-function generateForUserTopics(req, res, next) {
+function generateForUserTopics(req, res, callback) {
 	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
-		return next();
+		return callback();
 	}
 
 	var userslug = req.params.userslug;
 
 	async.waterfall([
-		function(next) {
+		function (next) {
 			user.getUidByUserslug(userslug, next);
 		},
-		function(uid, next) {
+		function (uid, next) {
+			if (!uid) {
+				return callback();
+			}
 			user.getUserFields(uid, ['uid', 'username'], next);
 		}
 	], function(err, userData) {
@@ -134,30 +126,41 @@ function generateForCategory(req, res, next) {
 	}
 	var cid = req.params.category_id;
 
-	categories.getCategoryById({
+	async.waterfall([
-		cid: cid,
+		function (next) {
-		set: 'cid:' + cid + ':tids',
+			async.parallel({
-		reverse: true,
+				privileges: function(next) {
-		start: 0,
+					privileges.categories.get(cid, req.uid, next);
-		stop: 25,
+				},
-		uid: req.uid
+				category: function(next) {
-	}, function (err, categoryData) {
+					categories.getCategoryById({
+						cid: cid,
+						set: 'cid:' + cid + ':tids',
+						reverse: true,
+						start: 0,
+						stop: 25,
+						uid: req.uid
+					}, next);
+				}
+			}, next);
+		},
+		function (results, next) {
+			if (!results.privileges.read) {
+				return helpers.notAllowed(req, res);
+			}
+			generateTopicsFeed({
+				uid: req.uid,
+				title: results.category.name,
+				description: results.category.description,
+				feed_url: '/category/' + cid + '.rss',
+				site_url: '/category/' + results.category.cid,
+			}, results.category.topics, next);
+		}
+	], function(err, feed) {
 		if (err) {
 			return next(err);
 		}
-
+		sendFeed(feed, res);
-		generateTopicsFeed({
-			uid: req.uid,
-			title: categoryData.name,
-			description: categoryData.description,
-			feed_url: '/category/' + cid + '.rss',
-			site_url: '/category/' + categoryData.cid,
-		}, categoryData.topics, function(err, feed) {
-			if (err) {
-				return next(err);
-			}
-			sendFeed(feed, res);
-		});
 	});
 }
 
@@ -300,6 +303,9 @@ function generateForCategoryRecentPosts(req, res, next) {
 	var cid = req.params.category_id;
 
 	async.parallel({
+		privileges: function(next) {
+			privileges.categories.get(cid, req.uid, next);
+		},
 		category: function(next) {
 			categories.getCategoryData(cid, next);
 		},
@@ -310,16 +316,20 @@ function generateForCategoryRecentPosts(req, res, next) {
 		if (err) {
 			return next(err);
 		}
+		if (!results.category) {
+			return next();
+		}
 
-		var category = results.category;
+		if (!results.privileges.read) {
-		var posts = results.posts;
+			return helpers.notAllowed(req, res);
+		}
 
 		var feed = generateForPostsFeed({
-			title: category.name + ' Recent Posts',
+			title: results.category.name + ' Recent Posts',
-			description: 'A list of recent posts from ' + category.name,
+			description: 'A list of recent posts from ' + results.category.name,
 			feed_url: '/category/' + cid + '/recentposts.rss',
 			site_url: '/category/' + cid + '/recentposts'
-		}, posts);
+		}, results.posts);
 
 		sendFeed(feed, res);
 	});
@@ -355,12 +365,12 @@ function sendFeed(feed, res) {
 }
 
 module.exports = function(app, middleware, controllers){
-	app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
+	app.get('/topic/:topic_id.rss', generateForTopic);
-	app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
+	app.get('/category/:category_id.rss', generateForCategory);
 	app.get('/recent.rss', generateForRecent);
 	app.get('/popular.rss', generateForPopular);
 	app.get('/popular/:term.rss', generateForPopular);
 	app.get('/recentposts.rss', generateForRecentPosts);
-	app.get('/category/:category_id/recentposts.rss', hasCategoryPrivileges, generateForCategoryRecentPosts);
+	app.get('/category/:category_id/recentposts.rss', generateForCategoryRecentPosts);
 	app.get('/user/:userslug/topics.rss', generateForUserTopics);
 };

src/topics.js

@@ -170,28 +170,19 @@ var async = require('async'),
 		], callback);
 	};
 
-	Topics.getTopicWithPosts = function(tid, set, uid, start, stop, reverse, callback) {
+	Topics.getTopicWithPosts = function(topicData, set, uid, start, stop, reverse, callback) {
-		var topicData;
 		async.waterfall([
-			function(next) {
+			function (next) {
-				Topics.getTopicData(tid, next);
-			},
-			function(_topicData, next) {
-				topicData = _topicData;
-				if (!topicData) {
-					return callback(new Error('[[error:no-topic]]'));
-				}
-
 				async.parallel({
 					posts: async.apply(getMainPostAndReplies, topicData, set, uid, start, stop, reverse),
-					category: async.apply(Topics.getCategoryData, tid),
+					category: async.apply(Topics.getCategoryData, topicData.tid),
 					threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
-					tags: async.apply(Topics.getTopicTagsObjects, tid),
+					tags: async.apply(Topics.getTopicTagsObjects, topicData.tid),
-					isFollowing: async.apply(Topics.isFollowing, [tid], uid),
+					isFollowing: async.apply(Topics.isFollowing, [topicData.tid], uid),
-					bookmark: async.apply(Topics.getUserBookmark, tid, uid)
+					bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid)
 				}, next);
 			},
-			function(results, next) {
+			function (results, next) {
 				topicData.posts = results.posts;
 				topicData.category = results.category;
 				topicData.thread_tools = results.threadTools.tools;
@@ -206,11 +197,11 @@ var async = require('async'),
 
 				Topics.getRelatedTopics(topicData, uid, next);
 			},
-			function(related, next) {
+			function (related, next) {
 				topicData.related = related || [];
 				plugins.fireHook('filter:topic.get', {topic: topicData, uid: uid}, next);
 			},
-			function(data, next) {
+			function (data, next) {
 				next(null, data.topic);
 			}
 		], callback);