Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1964

Browse Source
This commit is contained in:
barisusakli
2014-08-14 15:19:57 -04:00
parent 60624eedec
commit d91fa5747d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/recent.json
View File

@@ -4,5 +4,6 @@
"week": "Week", "week": "Week",
"month": "Month", "month": "Month",
"year": "Year", "year": "Year",
"alltime": "All Time",
"no_recent_topics": "There are no recent topics." "no_recent_topics": "There are no recent topics."
} }

4
src/controllers/categories.js
View File

@@ -17,7 +17,7 @@ categoriesController.recent = function(req, res, next) {
return next(err); return next(err);
} }
data['feeds:disableRSS'] = meta.config['feeds:disableRSS'] === '1' ? true : false; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
res.render('recent', data); res.render('recent', data);
}); });
@@ -33,7 +33,7 @@ categoriesController.popular = function(req, res, next) {
return next(err); return next(err);
} }
data['feeds:disableRSS'] = meta.config['feeds:disableRSS'] === '1' ? true : false; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
res.render('popular', {topics: data}); res.render('popular', {topics: data});
}); });

10
src/topics/popular.js
View File

@@ -16,6 +16,10 @@ module.exports = function(Topics) {
yearly: 'year' yearly: 'year'
}; };
if (term === 'alltime') {
return getAllTimePopular(uid, callback);
}
var since = terms[term] || 'day'; var since = terms[term] || 'day';
async.waterfall([ async.waterfall([
@@ -45,6 +49,12 @@ module.exports = function(Topics) {
], callback); ], callback);
}; };
function getAllTimePopular(uid, callback) {
Topics.getTopicsFromSet(uid, 'topics:posts', 0, 19, function(err, data) {
callback(err, data ? data.topics : null);
});
}
function getTopics(tids, uid, callback) { function getTopics(tids, uid, callback) {
var keys = tids.map(function(tid) { var keys = tids.map(function(tid) {
return 'topic:' + tid; return 'topic:' + tid;