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

fix: send back empty array if no direct replies, bug with reply generation

Browse Source
This commit is contained in:
Julian Lam
2024-07-05 15:50:14 -04:00
parent 26a7c51a9a
commit af6ae6ee8a
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/activitypub/mocks.js
View File

@@ -5,6 +5,7 @@ const mime = require('mime');
const path = require('path'); const path = require('path');
const sanitize = require('sanitize-html'); const sanitize = require('sanitize-html');
const db = require('../database');
const meta = require('../meta'); const meta = require('../meta');
const user = require('../user'); const user = require('../user');
const categories = require('../categories'); const categories = require('../categories');
@@ -384,6 +385,8 @@ Mocks.note = async (post) => {
return payload; return payload;
}); });
const replyCount = await db.sortedSetCard(`pid:${post.pid}:replies`);
const object = { const object = {
'@context': 'https://www.w3.org/ns/activitystreams', '@context': 'https://www.w3.org/ns/activitystreams',
id, id,
@@ -403,7 +406,7 @@ Mocks.note = async (post) => {
source, source,
tag, tag,
attachment, attachment,
replies: `${id}/replies`, replies: replyCount > 0 ? `${id}/replies` : [],
}; };
return object; return object;

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

@@ -63,6 +63,12 @@ Actors.note = async function (req, res) {
}; };
Actors.replies = async function (req, res) { Actors.replies = async function (req, res) {
const allowed = utils.isNumber(req.params.pid) && await privileges.posts.can('topics:read', req.params.pid, activitypub._constants.uid);
const exists = await posts.exists(req.params.pid);
if (!allowed || !exists) {
return res.sendStatus(404);
}
const page = parseInt(req.query.page, 10); const page = parseInt(req.query.page, 10);
const replies = await activitypub.helpers.generateCollection({ const replies = await activitypub.helpers.generateCollection({
set: `pid:${req.params.pid}:replies`, set: `pid:${req.params.pid}:replies`,
@@ -71,6 +77,9 @@ Actors.replies = async function (req, res) {
url: `${nconf.get('url')}/post/${req.params.pid}/replies`, url: `${nconf.get('url')}/post/${req.params.pid}/replies`,
}); });
// Convert pids to urls
replies.orderedItems = replies.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));
const object = { const object = {
'@context': 'https://www.w3.org/ns/activitystreams', '@context': 'https://www.w3.org/ns/activitystreams',
id: `${nconf.get('url')}/post/${req.params.pid}/replies${replies.orderedItems && page ? `?page=${page}` : ''}`, id: `${nconf.get('url')}/post/${req.params.pid}/replies${replies.orderedItems && page ? `?page=${page}` : ''}`,
@@ -78,9 +87,6 @@ Actors.replies = async function (req, res) {
...replies, ...replies,
} }
// Convert pids to urls
replies.orderedItems = replies.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));
res.status(200).json(object); res.status(200).json(object);
}; };