Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7102

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-12-12 13:46:13 -05:00
parent 74d0e88df3
commit 85a07e999b
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/mongo/sorted.js
View File

@@ -39,7 +39,11 @@ module.exports = function (db, module) {
if (!key.length) { if (!key.length) {
return setImmediate(callback, null, []); return setImmediate(callback, null, []);
} }
key = { $in: key }; if (key.length > 1) {
key = { $in: key };
} else {
key = key[0];
}
} }
var query = { _key: key }; var query = { _key: key };

26
src/topics/sorted.js
View File

@@ -49,16 +49,7 @@ module.exports = function (Topics) {
if (params.term === 'alltime') { if (params.term === 'alltime') {
var key = 'topics:' + params.sort; var key = 'topics:' + params.sort;
if (params.cids) { if (params.cids) {
key = params.cids.map(function (cid) { key = getCidSets(params.cids, params.sort);
if (params.sort === 'recent') {
return 'cid:' + cid + ':tids:lastposttime';
} else if (params.sort === 'votes') {
return 'cid:' + cid + ':tids:votes';
} else if (params.sort === 'posts') {
return 'cid:' + cid + ':tids:posts';
}
return 'cid:' + cid + ':tids';
});
} }
db.getSortedSetRevRange(key, 0, 199, next); db.getSortedSetRevRange(key, 0, 199, next);
@@ -67,7 +58,7 @@ module.exports = function (Topics) {
} }
}, },
function (tids, next) { function (tids, next) {
if (params.term !== 'alltime') { if (params.term !== 'alltime' || (params.cids && params.sort !== 'recent')) {
sortTids(tids, params, next); sortTids(tids, params, next);
} else { } else {
next(null, tids); next(null, tids);
@@ -79,6 +70,19 @@ module.exports = function (Topics) {
], callback); ], callback);
} }
function getCidSets(cids, sort) {
const keys = [];
cids.forEach(function (cid) {
if (sort === 'recent') {
keys.push('cid:' + cid + ':tids:lastposttime');
return;
}
keys.push('cid:' + cid + ':tids' + (sort ? ':' + sort : ''));
keys.push('cid:' + cid + ':tids:pinned');
});
return keys;
}
function sortTids(tids, params, callback) { function sortTids(tids, params, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {