Node.js based forum software built for the modern web
Merge branch 'master' into develop
Julian Lamd7cc637675e0
diff --cc src/controllers/activitypub/actors.jsindex 6a74c2da56,85e2fda01c..0f7a348990--- a/src/controllers/activitypub/actors.js+++ b/src/controllers/activitypub/actors.js@@@ -92,17 -92,20 +92,22 @@@ Actors.replies = async function (req, r}const page = parseInt(req.query.page, 10);- const replies = await activitypub.helpers.generateCollection({- set: `pid:${req.params.pid}:replies`,- page,- perPage: meta.config.postsPerPage,- url: `${nconf.get('url')}/post/${req.params.pid}/replies`,- });+ let replies;+ try {+ replies = await activitypub.helpers.generateCollection({+ set: `pid:${req.params.pid}:replies`,+ page,+ perPage: meta.config.postsPerPage,+ url: `${nconf.get('url')}/post/${req.params.pid}/replies`,+ });+ } catch (e) {+ return next(); // invalid page; 404+ }// Convert pids to urls- replies.orderedItems = replies.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));+ if (replies.orderedItems) {+ replies.orderedItems = replies.orderedItems.map(pid => (utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid));+ }const object = {'@context': 'https://www.w3.org/ns/activitystreams',