From c7d6cacd9849ce29e332048148186a42acea74f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Thu, 26 Jul 2018 10:52:06 -0400
Subject: [PATCH] closes #6658

---
 src/routes/feeds.js | 38 ++++++++++++++++++++++++++++++++------
 test/controllers.js |  9 +++++++++
 test/feeds.js       |  1 +
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/routes/feeds.js b/src/routes/feeds.js
index f843e08e7a..eb2e2e051c 100644
--- a/src/routes/feeds.js
+++ b/src/routes/feeds.js
@@ -26,6 +26,7 @@ var terms = {
 module.exports = function (app, middleware) {
 	app.get('/topic/:topic_id.rss', middleware.maintenanceMode, generateForTopic);
 	app.get('/category/:category_id.rss', middleware.maintenanceMode, generateForCategory);
+	app.get('/topics.rss', middleware.maintenanceMode, generateForTopics);
 	app.get('/recent.rss', middleware.maintenanceMode, generateForRecent);
 	app.get('/top.rss', middleware.maintenanceMode, generateForTop);
 	app.get('/top/:term.rss', middleware.maintenanceMode, generateForTop);
@@ -191,6 +192,31 @@ function generateForCategory(req, res, next) {
 	], next);
 }
 
+function generateForTopics(req, res, next) {
+	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
+		return controllers404.send404(req, res);
+	}
+
+	async.waterfall([
+		function (next) {
+			if (req.query.token && req.query.uid) {
+				db.getObjectField('user:' + req.query.uid, 'rss_token', next);
+			} else {
+				next(null, null);
+			}
+		},
+		function (token, next) {
+			sendTopicsFeed({
+				uid: token && token === req.query.token ? req.query.uid : req.uid,
+				title: 'Most recently created topics',
+				description: 'A list of topics that have been created recently',
+				feed_url: '/topics.rss',
+				useMainPost: true,
+			}, 'topics:tid', req, res, next);
+		},
+	], next);
+}
+
 function generateForRecent(req, res, next) {
 	if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
 		return controllers404.send404(req, res);
@@ -205,7 +231,7 @@ function generateForRecent(req, res, next) {
 			}
 		},
 		function (token, next) {
-			generateForTopics({
+			sendTopicsFeed({
 				uid: token && token === req.query.token ? req.query.uid : req.uid,
 				title: 'Recently Active Topics',
 				description: 'A list of topics that have been active within the past 24 hours',
@@ -297,7 +323,7 @@ function generateForPopular(req, res, next) {
 	], next);
 }
 
-function generateForTopics(options, set, req, res, next) {
+function sendTopicsFeed(options, set, req, res, next) {
 	var start = options.hasOwnProperty('start') ? options.start : 0;
 	var stop = options.hasOwnProperty('stop') ? options.stop : 19;
 	async.waterfall([
@@ -326,14 +352,14 @@ function generateTopicsFeed(feedOptions, feedTopics, callback) {
 		feed.pubDate = new Date(parseInt(feedTopics[0].lastposttime, 10)).toUTCString();
 	}
 
-	async.each(feedTopics, function (topicData, next) {
+	async.eachSeries(feedTopics, function (topicData, next) {
 		var feedItem = {
 			title: utils.stripHTMLTags(topicData.title, utils.tags),
 			url: nconf.get('url') + '/topic/' + topicData.slug,
 			date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString(),
 		};
 
-		if (topicData.teaser && topicData.teaser.user) {
+		if (topicData.teaser && topicData.teaser.user && !feedOptions.useMainPost) {
 			feedItem.description = topicData.teaser.content;
 			feedItem.author = topicData.teaser.user.username;
 			feed.item(feedItem);
@@ -464,7 +490,7 @@ function generateForUserTopics(req, res, callback) {
 			user.getUserFields(uid, ['uid', 'username'], next);
 		},
 		function (userData, next) {
-			generateForTopics({
+			sendTopicsFeed({
 				uid: req.uid,
 				title: 'Topics by ' + userData.username,
 				description: 'A list of topics that are posted by ' + userData.username,
@@ -484,7 +510,7 @@ function generateForTag(req, res, next) {
 	var topicsPerPage = meta.config.topicsPerPage || 20;
 	var start = Math.max(0, (page - 1) * topicsPerPage);
 	var stop = start + topicsPerPage - 1;
-	generateForTopics({
+	sendTopicsFeed({
 		uid: req.uid,
 		title: 'Topics tagged with ' + tag,
 		description: 'A list of topics that have been tagged with ' + tag,
diff --git a/test/controllers.js b/test/controllers.js
index 65ec3c6b91..a61594c47d 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -442,6 +442,15 @@ describe('Controllers', function () {
 		});
 	});
 
+	it('should load topics rss feed', function (done) {
+		request(nconf.get('url') + '/topics.rss', function (err, res, body) {
+			assert.ifError(err);
+			assert.equal(res.statusCode, 200);
+			assert(body);
+			done();
+		});
+	});
+
 	it('should load recent rss feed', function (done) {
 		request(nconf.get('url') + '/recent.rss', function (err, res, body) {
 			assert.ifError(err);
diff --git a/test/feeds.js b/test/feeds.js
index 2d8156404c..2155ba5793 100644
--- a/test/feeds.js
+++ b/test/feeds.js
@@ -52,6 +52,7 @@ describe('feeds', function () {
 		var feedUrls = [
 			nconf.get('url') + '/topic/' + tid + '.rss',
 			nconf.get('url') + '/category/' + cid + '.rss',
+			nconf.get('url') + '/topics.rss',
 			nconf.get('url') + '/recent.rss',
 			nconf.get('url') + '/top.rss',
 			nconf.get('url') + '/popular.rss',