Node.js based forum software built for the modern web
fix: extra `orderedItems` property in generated paginated OrderedCollection, #13153
Julian Lamf83b1fbf68a4
diff --git a/src/activitypub/helpers.js b/src/activitypub/helpers.jsindex b67484ff1d..299d0c3d35 100644--- a/src/activitypub/helpers.js+++ b/src/activitypub/helpers.js@@ -451,6 +451,8 @@ Helpers.makeSet = (object, properties) => new Set(properties.reduce((memo, propeHelpers.generateCollection = async ({ set, method, count, page, perPage, url }) => {if (!method) {method = db.getSortedSetRange.bind(null, set);+ } else if (set) {+ method = method.bind(null, set);}count = count || await db.sortedSetCard(set);const pageCount = Math.max(1, Math.ceil(count / perPage));@@ -486,8 +488,6 @@ Helpers.generateCollection = async ({ set, method, count, page, perPage, url })object.next = page < pageCount ? `${url}?page=${page + 1}` : null;object.prev = page > 1 ? `${url}?page=${page - 1}` : null;}- } else {- object.orderedItems = [];}if (paginate) {diff --git a/src/controllers/activitypub/actors.js b/src/controllers/activitypub/actors.jsindex f9212ba09d..bef49ea835 100644--- a/src/controllers/activitypub/actors.js+++ b/src/controllers/activitypub/actors.js@@ -156,7 +156,7 @@ Actors.topic = async function (req, res, next) {res.set('ETag', digest);// Convert pids to urls- if (page || collection.totalItems < meta.config.postsPerPage) {+ if (page || collection.totalItems < perPage) {collection.orderedItems = collection.orderedItems || [];if (!page || page === 1) { // add OP to collectioncollection.orderedItems.unshift(mainPid);