Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-19 04:57:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #12893, topic with pages returning OrderedCollectionPage instead of OrderedCollection.

Browse Source 
Turns out empty arrays are still truthy, heh.
This commit is contained in:
Julian Lam
2024-11-04 13:43:28 -05:00
parent cf3555faaa
commit d685b20e0a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/activitypub/helpers.js
View File

@@ -429,7 +429,7 @@ Helpers.generateCollection = async ({ set, method, page, perPage, url }) => {
} }
const object = { const object = {
type: paginate && items ? 'OrderedCollectionPage' : 'OrderedCollection', type: paginate && items.length ? 'OrderedCollectionPage' : 'OrderedCollection',
totalItems: count, totalItems: count,
}; };

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

@@ -118,7 +118,7 @@ Actors.topic = async function (req, res, next) {
return res.sendStatus(404); return res.sendStatus(404);
} }
const page = parseInt(req.query.page, 10); const page = parseInt(req.query.page, 10) || undefined;
const perPage = meta.config.postsPerPage; const perPage = meta.config.postsPerPage;
const { cid, titleRaw: name, mainPid, slug } = await topics.getTopicFields(req.params.tid, ['cid', 'title', 'mainPid', 'slug']); const { cid, titleRaw: name, mainPid, slug } = await topics.getTopicFields(req.params.tid, ['cid', 'title', 'mainPid', 'slug']);
try { try {
@@ -132,10 +132,11 @@ Actors.topic = async function (req, res, next) {
}), }),
db.getSortedSetMembers(`tid:${req.params.tid}:posts`), db.getSortedSetMembers(`tid:${req.params.tid}:posts`),
]); ]);
// Generate digest for ETag
pids.push(mainPid); pids.push(mainPid);
pids = pids.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid)); pids = pids.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));
collection.totalItems += 1; // account for mainPid
// Generate digest for ETag
const digest = activitypub.helpers.generateDigest(new Set(pids)); const digest = activitypub.helpers.generateDigest(new Set(pids));
const ifNoneMatch = (req.get('If-None-Match') || '').split(',').map((tag) => { const ifNoneMatch = (req.get('If-None-Match') || '').split(',').map((tag) => {
tag = tag.trim(); tag = tag.trim();
@@ -151,7 +152,6 @@ Actors.topic = async function (req, res, next) {
res.set('ETag', digest); res.set('ETag', digest);
// Convert pids to urls // Convert pids to urls
collection.totalItems += 1;
if (page || collection.totalItems < meta.config.postsPerPage) { if (page || collection.totalItems < meta.config.postsPerPage) {
collection.orderedItems = collection.orderedItems || []; collection.orderedItems = collection.orderedItems || [];
if (!page || page === 1) { // add OP to collection if (!page || page === 1) { // add OP to collection