Node.js based forum software built for the modern web
fix(activitypub): fall through to getParentChain for local topic contexts
Julian Lam189d6366eb7b
diff --git a/src/activitypub/notes.js b/src/activitypub/notes.jsindex e161dfe03f..28a5c482af 100644--- a/src/activitypub/notes.js+++ b/src/activitypub/notes.js@@ -83,7 +83,8 @@ Notes.assert = async (uid, input, options = { skipChecks: false, queue: false })const { tid } = context;return { tid, count: 0 };} else if (context.context) {- const { type, id: tid } = await activitypub.helpers.resolveLocalId(context.context);+ const { type } = await activitypub.helpers.resolveLocalId(context.context);+ // Remote contexts only, if context is local, prefer parent chain traversal instead (to catch out-of-band replies)if (type !== 'topic') {chain = Array.from(await activitypub.contexts.getItems(uid, context.context, { input }));if (chain && chain.length) {@@ -98,18 +99,6 @@ Notes.assert = async (uid, input, options = { skipChecks: false, queue: false })// Context resolves, use in later topic creationcontext = context.context;}- } else {- // Local context, get local posts- const mainPid = await topics.getTopicField(tid, 'mainPid');- const pids = await db.getSortedSetMembers(`tid:${tid}:posts`);- pids.unshift(mainPid);- chain = await posts.getPostsData(pids);-- // Add received object to chain if not present already- if (!pids.includes(input.id)) {- const mocked = await activitypub.mocks.post(input);- chain.push(mocked);- }}} else {context = undefined;