Node.js based forum software built for the modern web
fix: have notes.assert call out.announce.topic only if uid is set (so, if note assertion is called via search; manual pull)
Julian Lam3b7bcba6c017
diff --git a/src/activitypub/feps.js b/src/activitypub/feps.jsindex 1aa711f2b2..262010b7da 100644--- a/src/activitypub/feps.js+++ b/src/activitypub/feps.js@@ -55,7 +55,6 @@ Feps.announce = async function announce(id, activity) {if (activity.type === 'Create') {const isMain = await posts.isMain(localId || id);- console.log('plain announce', activity);if (isMain) {activitypub.helpers.log(`[activitypub/inbox.announce(1b12)] Announcing plain object (${activity.id}) to followers of cid ${cid} and ${relays.length} relays`);await activitypub.send('cid', localCid ? cid : 0, targets, {@@ -70,7 +69,6 @@ Feps.announce = async function announce(id, activity) {}activitypub.helpers.log(`[activitypub/inbox.announce(1b12)] Announcing ${activity.type} (${activity.id}) to followers of cid ${cid} and ${relays.length} relays`);- console.log('activity announce', activity);await activitypub.send('cid', localCid ? cid : 0, targets, {id: `${nconf.get('url')}/post/${encodeURIComponent(id)}#activity/announce/${now}`,type: 'Announce',diff --git a/src/activitypub/notes.js b/src/activitypub/notes.jsindex 21aebb4c63..14420724f0 100644--- a/src/activitypub/notes.js+++ b/src/activitypub/notes.js@@ -265,8 +265,8 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {await Notes.syncUserInboxes(tid, uid);- if (!hasTid && options.cid) {- // New topic, have category announce it+ if (!hasTid && uid && options.cid) {+ // New topic via search/post-redirect, have category announce itactivitypub.out.announce.topic(tid);}