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

fix: if post count is less than posts per page, don't paginate in ordered collection

Browse Source
This commit is contained in:
Julian Lam
2024-05-03 14:16:32 -04:00
parent 4b29a1b91d
commit 1a21c8add4
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/controllers/activitypub/actors.js
View File

@@ -68,10 +68,16 @@ Actors.topic = async function (req, res, next) {
return res.sendStatus(404); return res.sendStatus(404);
} }
const page = parseInt(req.query.page, 10); let page = parseInt(req.query.page, 10);
const { cid, mainPid, slug, postcount } = await topics.getTopicFields(req.params.tid, ['cid', 'mainPid', 'slug', 'postcount']); const { cid, mainPid, slug, postcount } = await topics.getTopicFields(req.params.tid, ['cid', 'mainPid', 'slug', 'postcount']);
const pageCount = Math.max(1, Math.ceil(postcount / meta.config.postsPerPage)); const pageCount = Math.max(1, Math.ceil(postcount / meta.config.postsPerPage));
let items; let items;
let paginate = true;
if (!page && pageCount === 1) {
page = 1;
paginate = false;
}
if (page) { if (page) {
const invalidPagination = page < 1 || page > pageCount; const invalidPagination = page < 1 || page > pageCount;
@@ -91,7 +97,7 @@ Actors.topic = async function (req, res, next) {
const object = { const object = {
'@context': 'https://www.w3.org/ns/activitystreams', '@context': 'https://www.w3.org/ns/activitystreams',
id: `${nconf.get('url')}/topic/${req.params.tid}${page ? `?page=${page}` : ''}`, id: `${nconf.get('url')}/topic/${req.params.tid}${paginate && page ? `?page=${page}` : ''}`,
url: `${nconf.get('url')}/topic/${slug}`, url: `${nconf.get('url')}/topic/${slug}`,
type: items ? 'OrderedCollectionPage' : 'OrderedCollection', type: items ? 'OrderedCollectionPage' : 'OrderedCollection',
audience: `${nconf.get('url')}/category/${cid}`, audience: `${nconf.get('url')}/category/${cid}`,
@@ -101,11 +107,17 @@ Actors.topic = async function (req, res, next) {
if (items) { if (items) {
object.partOf = `${nconf.get('url')}/topic/${req.params.tid}`; object.partOf = `${nconf.get('url')}/topic/${req.params.tid}`;
object.items = items; object.items = items;
object.next = page < pageCount ? `${nconf.get('url')}/topic/${req.params.tid}?page=${page + 1}` : null;
object.prev = page > 1 ? `${nconf.get('url')}/topic/${req.params.tid}?page=${page - 1}` : null; if (paginate) {
object.next = page < pageCount ? `${nconf.get('url')}/topic/${req.params.tid}?page=${page + 1}` : null;
object.prev = page > 1 ? `${nconf.get('url')}/topic/${req.params.tid}?page=${page - 1}` : null;
}
}
if (paginate) {
object.first = `${nconf.get('url')}/topic/${req.params.tid}?page=1`;
object.last = `${nconf.get('url')}/topic/${req.params.tid}?page=${pageCount}`;
} }
object.first = `${nconf.get('url')}/topic/${req.params.tid}?page=1`;
object.last = `${nconf.get('url')}/topic/${req.params.tid}?page=${pageCount}`;
res.status(200).json(object); res.status(200).json(object);
}; };