Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-01 21:30:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow floating pinned topics to top in getSortedTopics

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-08-22 13:04:14 -04:00
parent 6f7ab5861e
commit 1d7e0c6341
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/recent.js
View File

@@ -55,6 +55,7 @@ recentController.getData = async function (req, url, sort) {
filter: filter,
term: term,
sort: sort,
floatPinned: req.query.pinned,
query: req.query,
});

31
src/topics/sorted.js
View File

@@ -42,7 +42,7 @@ module.exports = function (Topics) {
} else {
tids = await Topics.getLatestTidsFromSet('topics:tid', 0, -1, params.term);
}
if (params.term !== 'alltime' || (params.cids && params.sort !== 'recent')) {
if (params.term !== 'alltime' || params.cids || params.floatPinned) {
tids = await sortTids(tids, params);
}
return await filterTids(tids, params);
@@ -53,10 +53,10 @@ module.exports = function (Topics) {
const pinnedSets = [];
cids.forEach(function (cid) {
if (sort === 'recent') {
sets.push('cid:' + cid + ':tids:lastposttime');
return;
sets.push('cid:' + cid + ':tids');
} else {
sets.push('cid:' + cid + ':tids' + (sort ? ':' + sort : ''));
}
sets.push('cid:' + cid + ':tids' + (sort ? ':' + sort : ''));
pinnedSets.push('cid:' + cid + ':tids:pinned');
});
const [tids, pinnedTids] = await Promise.all([
@@ -67,15 +67,30 @@ module.exports = function (Topics) {
}
async function sortTids(tids, params) {
const topicData = await Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount']);
var sortFn = sortRecent;
const topicData = await Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned']);
let sortFn = sortRecent;
if (params.sort === 'posts') {
sortFn = sortPopular;
} else if (params.sort === 'votes') {
sortFn = sortVotes;
}
tids = topicData.sort(sortFn).map(topic => topic && topic.tid);
return tids;
if (params.floatPinned) {
floatPinned(topicData, sortFn);
} else {
topicData.sort(sortFn);
}
return topicData.map(topic => topic && topic.tid);
}
function floatPinned(topicData, sortFn) {
topicData.sort((a, b) => {
if (a.pinned !== b.pinned) {
return b.pinned - a.pinned;
}
return sortFn(a, b);
});
}
function sortRecent(a, b) {