closes #2835

src/controllers/categories.js

@@ -55,7 +55,7 @@ categoriesController.popular = function(req, res, next) {
 		var data = {
 			topics: topics,
 			'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1,
-			rssFeedUrl: nconf.get('relative_path') + '/popular.rss',
+			rssFeedUrl: nconf.get('relative_path') + '/popular/' + (req.params.term || 'daily') + '.rss',
 			breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:header.popular]]'}])
 		};
 

src/routes/feeds.js

@@ -135,14 +135,17 @@ function generateForCategory(req, res, next) {
 			return next(err);
 		}
 
-		var feed = generateTopicsFeed({
+		generateTopicsFeed({
 			title: categoryData.name,
 			description: categoryData.description,
 			feed_url: '/category/' + cid + '.rss',
 			site_url: '/category/' + categoryData.cid,
-		}, categoryData.topics);
+		}, categoryData.topics, function(err, feed) {
-
+			if (err) {
-		sendFeed(feed, res);
+				return next(err);
+			}
+			sendFeed(feed, res);	
+		});		
 	});
 }
 
@@ -156,12 +159,32 @@ function generateForRecent(req, res, next) {
 }
 
 function generateForPopular(req, res, next) {
-	generateForTopics({
+	var uid = req.user ? req.user.uid : 0;
-		title: 'Popular Topics',
+	var terms = {
-		description: 'A list of topics that are sorted by post count',
+		daily: 'day',
-		feed_url: '/popular.rss',
+		weekly: 'week',
-		site_url: '/popular'
+		monthly: 'month',
-	}, 'topics:posts', req, res, next);
+		alltime: 'alltime'
+	};
+	var term = terms[req.params.term] || 'day';
+
+	topics.getPopular(term, uid, 19, function(err, topics) {
+		if (err) {
+			return next(err);
+		}
+
+		generateTopicsFeed({
+			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) {
+			if (err) {
+				return next(err);
+			}
+			sendFeed(feed, res);
+		});	
+	});	
 }
 
 function disabledRSS(req, res, next) {
@@ -178,35 +201,58 @@ function generateForTopics(options, set, req, res, next) {
 		if (err) {
 			return next(err);
 		}
-
+		
-		var feed = generateTopicsFeed(options, data.topics);
+		generateTopicsFeed(options, data.topics, function(err, feed) {
-
+			if (err) {
-		sendFeed(feed, res);
+				return next(err);
+			}
+			sendFeed(feed, res);	
+		});	
 	});
 }
 
-function generateTopicsFeed(feedOptions, topics) {
+function generateTopicsFeed(feedOptions, feedTopics, callback) {
+	var tids = feedTopics.map(function(topic) {
+		return topic ? topic.tid : null;
+	});
+	
+	topics.getMainPids(tids, function(err, pids) {
+		if (err) {
+			return callback(err);
+		}
+		posts.getPostsFields(pids, ['content'], function(err, posts) {
+			if (err) {
+				return callback(err);
+			}
 
-	feedOptions.ttl = 60;
+			feedTopics.forEach(function(topic, index) {
-	feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url;
+				if (topic && posts[index]) {
-	feedOptions.site_url = nconf.get('url') + feedOptions.site_url;
+					topic.mainPost = posts[index].content;
+				}
+			});
 
-	var	feed = new rss(feedOptions);
+			feedOptions.ttl = 60;
+			feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url;
+			feedOptions.site_url = nconf.get('url') + feedOptions.site_url;
 
-	if (topics.length > 0) {
+			var	feed = new rss(feedOptions);
-		feed.pubDate = new Date(parseInt(topics[0].lastposttime, 10)).toUTCString();
-	}
 
-	topics.forEach(function(topicData) {
+			if (feedTopics.length > 0) {
-		feed.item({
+				feed.pubDate = new Date(parseInt(feedTopics[0].lastposttime, 10)).toUTCString();
-			title: topicData.title,
+			}
-			url: nconf.get('url') + '/topic/' + topicData.slug,
-			author: topicData.username,
-			date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString()
-		});
-	});
 
-	return feed;
+			feedTopics.forEach(function(topicData) {
+				feed.item({
+					title: topicData.title,
+					description: topicData.mainPost,
+					url: nconf.get('url') + '/topic/' + topicData.slug,
+					author: topicData.username,
+					date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString()
+				});
+			});
+			callback(null, feed);
+		});
+	});	
 }
 
 function generateForRecentPosts(req, res, next) {
@@ -291,6 +337,7 @@ module.exports = function(app, middleware, controllers){
 	app.get('/category/:category_id.rss', hasCategoryPrivileges, disabledRSS, generateForCategory);
 	app.get('/recent.rss', disabledRSS, generateForRecent);
 	app.get('/popular.rss', disabledRSS, generateForPopular);
+	app.get('/popular/:term.rss', disabledRSS, generateForPopular);
 	app.get('/recentposts.rss', disabledRSS, generateForRecentPosts);
 	app.get('/category/:category_id/recentposts.rss', hasCategoryPrivileges, disabledRSS, generateForCategoryRecentPosts);
 	app.get('/user/:userslug/topics.rss', disabledRSS, generateForUserTopics);

src/topics.js

@@ -255,7 +255,7 @@ var async = require('async'),
 		});
 	};
 
-	Topics.getMainPosts = function(tids, uid, callback) {
+	Topics.getMainPids = function(tids, callback) {
 		Topics.getTopicsFields(tids, ['mainPid'], function(err, topicData) {
 			if (err) {
 				return callback(err);
@@ -264,7 +264,15 @@ var async = require('async'),
 			var mainPids = topicData.map(function(topic) {
 				return topic ? topic.mainPid : null;
 			});
+			callback(null, mainPids);
+		});
+	};
 
+	Topics.getMainPosts = function(tids, uid, callback) {
+		Topics.getMainPids(tids, function(err, mainPids) {
+			if (err) {
+				return callback(err);
+			}
 			getMainPosts(mainPids, uid, callback);
 		});
 	};