Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: flawed logic in generating topic context collection

Browse Source
This commit is contained in:
Julian Lam
2024-07-11 14:33:07 -04:00
parent 3c0d7616db
commit 31c7226e34
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/activitypub/helpers.js
View File

@@ -386,7 +386,7 @@ Helpers.generateCollection = async ({ set, method, page, perPage, url }) => {
totalItems: count, totalItems: count,
}; };
if (items) { if (items.length) {
object.orderedItems = items; object.orderedItems = items;
if (paginate) { if (paginate) {

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

@@ -90,7 +90,7 @@ Actors.replies = async function (req, res) {
res.status(200).json(object); res.status(200).json(object);
}; };
Actors.topic = async function (req, res) { Actors.topic = async function (req, res, next) {
const allowed = await privileges.topics.can('topics:read', req.params.tid, activitypub._constants.uid); const allowed = await privileges.topics.can('topics:read', req.params.tid, activitypub._constants.uid);
if (!allowed) { if (!allowed) {
return res.sendStatus(404); return res.sendStatus(404);
@@ -99,34 +99,39 @@ Actors.topic = async function (req, res) {
const page = parseInt(req.query.page, 10); const page = parseInt(req.query.page, 10);
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']);
const collection = await activitypub.helpers.generateCollection({ try {
set: `tid:${req.params.tid}:posts`, const collection = await activitypub.helpers.generateCollection({
method: posts.getPidsFromSet, set: `tid:${req.params.tid}:posts`,
page, method: posts.getPidsFromSet,
perPage, page,
url: `${nconf.get('url')}/topic/${req.params.tid}`, perPage,
}); url: `${nconf.get('url')}/topic/${req.params.tid}`,
});
// Convert pids to urls // Convert pids to urls
if (collection.orderedItems) { collection.totalItems += 1;
if (page === 1) { if (page || collection.totalItems < meta.config.postsPerPage) {
collection.orderedItems.unshift(mainPid); collection.orderedItems = collection.orderedItems || [];
collection.orderedItems.length = Math.min(collection.orderedItems.length, meta.config.postsPerPage); if (!page || page === 1) { // add OP to collection
collection.orderedItems.unshift(mainPid);
}
collection.orderedItems = collection.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));
} }
collection.orderedItems = collection.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));
const object = {
'@context': 'https://www.w3.org/ns/activitystreams',
id: `${nconf.get('url')}/topic/${req.params.tid}${collection.orderedItems && page ? `?page=${page}` : ''}`,
url: `${nconf.get('url')}/topic/${slug}`,
name,
attributedTo: `${nconf.get('url')}/category/${cid}`,
audience: cid !== -1 ? `${nconf.get('url')}/category/${cid}/followers` : undefined,
...collection,
};
res.status(200).json(object);
} catch (e) {
return next();
} }
const object = {
'@context': 'https://www.w3.org/ns/activitystreams',
id: `${nconf.get('url')}/topic/${req.params.tid}${collection.orderedItems && page ? `?page=${page}` : ''}`,
url: `${nconf.get('url')}/topic/${slug}`,
name,
attributedTo: `${nconf.get('url')}/category/${cid}`,
audience: cid !== -1 ? `${nconf.get('url')}/category/${cid}/followers` : undefined,
...collection,
};
res.status(200).json(object);
}; };
Actors.category = async function (req, res, next) { Actors.category = async function (req, res, next) {