Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: filter out topics in cid -1 from tagged topics page, closes #12489

Browse Source
This commit is contained in:
Julian Lam
2024-04-09 15:13:27 -04:00
parent fcd5447cd4
commit d437d969cc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/tags.js
View File

@@ -25,7 +25,7 @@ tagsController.getTag = async function (req, res) {
breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[tags:tags]]', url: '/tags' }, { text: tag }]), breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[tags:tags]]', url: '/tags' }, { text: tag }]),
title: `[[pages:tag, ${tag}]]`, title: `[[pages:tag, ${tag}]]`,
}; };
const [settings, cids, categoryData, canPost, isPrivileged, rssToken, isFollowing] = await Promise.all([ let [settings, cids, categoryData, canPost, isPrivileged, rssToken, isFollowing] = await Promise.all([
user.getSettings(req.uid), user.getSettings(req.uid),
cid || categories.getCidsByPrivilege('categories:cid', req.uid, 'topics:read'), cid || categories.getCidsByPrivilege('categories:cid', req.uid, 'topics:read'),
helpers.getSelectedCategory(cid), helpers.getSelectedCategory(cid),
@@ -34,6 +34,14 @@ tagsController.getTag = async function (req, res) {
user.auth.getFeedToken(req.uid), user.auth.getFeedToken(req.uid),
topics.isFollowingTag(req.params.tag, req.uid), topics.isFollowingTag(req.params.tag, req.uid),
]); ]);
// Explicitly exclude cid -1 if cid not specified
if (!cid) {
cids = new Set(cids);
cids.delete(-1);
cids = Array.from(cids);
}
const start = Math.max(0, (page - 1) * settings.topicsPerPage); const start = Math.max(0, (page - 1) * settings.topicsPerPage);
const stop = start + settings.topicsPerPage - 1; const stop = start + settings.topicsPerPage - 1;