From 4dbb73a433e37aec5989269d90dea6a0205155da Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 26 Jun 2024 14:32:48 -0400
Subject: [PATCH] fix: remove duplicate 1b12 announce in notes.assert (already
 handled in inbox)

---
 src/activitypub/notes.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/activitypub/notes.js b/src/activitypub/notes.js
index e460acac74..794d0660b8 100644
--- a/src/activitypub/notes.js
+++ b/src/activitypub/notes.js
@@ -33,9 +33,11 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
 	 * retrieving the entire reply tree is not possible at this time.
 	 */
 
-	const object = !activitypub.helpers.isUri(input) && input;
-	const id = object ? object.id : input;
+	if (!input) {
+		return null;
+	}
 
+	const id = !activitypub.helpers.isUri(input) ? input.id : input;
 	const lockStatus = await lock(id, '[[error:activitypub.already-asserting]]');
 	if (!lockStatus) { // unable to achieve lock, stop processing.
 		return null;
@@ -153,8 +155,6 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
 		unprocessed.pop();
 	}
 
-	const cidFollowers = await activitypub.notes.getCategoryFollowers(cid);
-
 	unprocessed.reverse();
 	for (const post of unprocessed) {
 		const { to, cc, attachment } = post._activitypub;
@@ -165,17 +165,6 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
 			Notes.updateLocalRecipients(post.pid, { to, cc }),
 			posts.attachments.update(post.pid, attachment),
 		]);
-
-		// Category announce
-		if (cidFollowers.length && object && object.id === post.pid) {
-			activitypub.send('cid', cid, cidFollowers, {
-				id: `${object.id}#activity/announce/${Date.now()}`,
-				type: 'Announce',
-				to: [`${nconf.get('url')}/category/${cid}/followers`],
-				cc: [activitypub._constants.publicAddress],
-				object,
-			});
-		}
 	}
 
 	await Promise.all([