closes #5440

src/routes/feeds.js

@@ -3,6 +3,7 @@
 var async = require('async');
 var rss = require('rss');
 var nconf = require('nconf');
+var validator = require('validator');
 
 var posts = require('../posts');
 var topics = require('../topics');
@@ -12,6 +13,18 @@ var meta = require('../meta');
 var helpers = require('../controllers/helpers');
 var privileges = require('../privileges');
 
+module.exports = function (app, middleware, controllers) {
+	app.get('/topic/:topic_id.rss', middleware.maintenanceMode, generateForTopic);
+	app.get('/category/:category_id.rss', middleware.maintenanceMode, generateForCategory);
+	app.get('/recent.rss', middleware.maintenanceMode, generateForRecent);
+	app.get('/popular.rss', middleware.maintenanceMode, generateForPopular);
+	app.get('/popular/:term.rss', middleware.maintenanceMode, generateForPopular);
+	app.get('/recentposts.rss', middleware.maintenanceMode, generateForRecentPosts);
+	app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, generateForCategoryRecentPosts);
+	app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, generateForUserTopics);
+	app.get('/tags/:tag.rss', middleware.maintenanceMode, generateForTag);
+};
+
 
 function generateForTopic(req, res, callback) {
 	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
@@ -63,8 +76,8 @@ function generateForTopic(req, res, callback) {
 			image_url: image_url,
 			author: author,
 			ttl: 60
-			}),
-			dateStamp;
+		});
+		var dateStamp;
 
 		if (topicData.posts.length > 0) {
 			feed.pubDate = new Date(parseInt(topicData.posts[0].timestamp, 10)).toUTCString();
@@ -189,39 +202,43 @@ function generateForPopular(req, res, next) {
 	};
 	var term = terms[req.params.term] || 'day';
 
-	topics.getPopular(term, req.uid, 19, function (err, topics) {
-		if (err) {
-			return next(err);
-		}
-
+	async.waterfall([
+		function (next) {
+			topics.getPopular(term, req.uid, 19, next);
+		},
+		function (topics, next) {
 			generateTopicsFeed({
 				uid: req.uid,
 				title: 'Popular Topics',
 				description: 'A list of topics that are sorted by post count',
 				feed_url: '/popular/' + (req.params.term || 'daily') + '.rss',
 				site_url: '/popular/' + (req.params.term || 'daily')
-		}, topics, function (err, feed) {
+			}, topics, next);
+		}
+	], function (err, feed) {
 		if (err) {
 			return next(err);
 		}
 		sendFeed(feed, res);
 	});
-	});
 }
 
 function generateForTopics(options, set, req, res, next) {
-	topics.getTopicsFromSet(set, req.uid, 0, 19, function (err, data) {
-		if (err) {
-			return next(err);
+	var start = options.hasOwnProperty('start') ? options.start : 0;
+	var stop = options.hasOwnProperty('stop') ? options.stop : 19;
+	async.waterfall([
+		function (next) {
+			topics.getTopicsFromSet(set, req.uid, start, stop, next);
+		},
+		function (data, next) {
+			generateTopicsFeed(options, data.topics, next);
 		}
-
-		generateTopicsFeed(options, data.topics, function (err, feed) {
+	], function (err, feed) {
 		if (err) {
 			return next(err);
 		}
 		sendFeed(feed, res);
 	});
-	});
 }
 
 function generateTopicsFeed(feedOptions, feedTopics, callback) {
@@ -359,18 +376,28 @@ function generateForPostsFeed(feedOptions, posts) {
 	return feed;
 }
 
+function generateForTag(req, res, next) {
+	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
+		return next();
+	}
+	var tag = validator.escape(String(req.params.tag));
+	var page = parseInt(req.query.page, 10) || 1;
+	var start = Math.max(0, (page - 1) * meta.config.topicsPerPage);
+	var stop = start + meta.config.topicsPerPage - 1;
+	generateForTopics({
+		uid: req.uid,
+		title: 'Topics tagged with ' + tag,
+		description: 'A list of topics that have been tagged with ' + tag,
+		feed_url: '/tags/' + tag + '.rss',
+		site_url: '/tags/' + tag,
+		start: start,
+		stop: stop
+	}, 'tag:' + tag + ':topics', req, res, next);
+}
+
 function sendFeed(feed, res) {
 	var xml = feed.xml();
 	res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
 }
 
-module.exports = function (app, middleware, controllers) {
-	app.get('/topic/:topic_id.rss', middleware.maintenanceMode, generateForTopic);
-	app.get('/category/:category_id.rss', middleware.maintenanceMode, generateForCategory);
-	app.get('/recent.rss', middleware.maintenanceMode, generateForRecent);
-	app.get('/popular.rss', middleware.maintenanceMode, generateForPopular);
-	app.get('/popular/:term.rss', middleware.maintenanceMode, generateForPopular);
-	app.get('/recentposts.rss', middleware.maintenanceMode, generateForRecentPosts);
-	app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, generateForCategoryRecentPosts);
-	app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, generateForUserTopics);
-};
+

test/controllers.js

@@ -288,6 +288,15 @@ describe('Controllers', function () {
 		});
 	});
 
+	it('should load tag rss feed', function (done) {
+		request(nconf.get('url') + '/tags/nodebb.rss', function (err, res, body) {
+			assert.ifError(err);
+			assert.equal(res.statusCode, 200);
+			assert(body);
+			done();
+		});
+	});
+
 	it('should load stylesheet.css', function (done) {
 		request(nconf.get('url') + '/stylesheet.css', function (err, res, body) {
 			assert.ifError(err);