Comment: Send announce for all new comments

.github/changelog/1562-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Incoming interactions create an Announce activity so other instances get notified about it.

includes/class-dispatcher.php

@@ -33,7 +33,7 @@ class Dispatcher {
 	 * @see https://github.com/tfredrich/RestApiTutorial.com/blob/fd08b0f67f07450521d143b123cd6e1846cb2e3b/content/advanced/responses/retries.md
 	 * @var int[]
 	 */
-	public static $retry_error_codes = array( 408, 429, 500, 502, 503, 504 );
+	public static $retry_error_codes = array( 400, 408, 429, 500, 502, 503, 504 );
 
 	/**
 	 * Initialize the class, registering WordPress hooks.

includes/collection/class-interactions.php

@@ -300,8 +300,9 @@ public static function activity_to_comment( $activity ) {
 			'comment_date'         => \get_date_from_gmt( \gmdate( 'Y-m-d H:i:s', \strtotime( $date ) ) ),
 			'comment_date_gmt'     => \gmdate( 'Y-m-d H:i:s', \strtotime( $date ) ),
 			'comment_meta'         => array(
-				'source_id' => \esc_url_raw( object_to_uri( $activity['object'] ) ),
-				'protocol'  => 'activitypub',
+				'source_id'             => \esc_url_raw( object_to_uri( $activity['object'] ) ),
+				'protocol'              => 'activitypub',
+				'_activitypub_activity' => $activity,
 			),
 		);
 

includes/scheduler/class-comment.php

@@ -7,6 +7,8 @@
 
 namespace Activitypub\Scheduler;
 
+use Activitypub\Activity\Activity;
+use Activitypub\Collection\Actors;
 use Activitypub\Comment as Comment_Utils;
 
 use function Activitypub\add_to_outbox;
@@ -45,9 +47,12 @@ public static function schedule_comment_activity( $new_status, $old_status, $com
 		}
 
 		$comment = get_comment( $comment );
+		if ( ! $comment ) {
+			return;
+		}
 
-		// Federate only comments that are written by a registered user.
-		if ( ! $comment || ! $comment->user_id ) {
+		if ( ! $comment->user_id ) {
+			self::maybe_announce_interaction( $new_status, $old_status, $comment );
 			return;
 		}
 
@@ -81,6 +86,64 @@ public static function schedule_comment_activity( $new_status, $old_status, $com
 		add_to_outbox( $comment, $type, $comment->user_id );
 	}
 
+	/**
+	 * Announce an interaction.
+	 *
+	 * When a comment is received from another ActivityPub instance and approved,
+	 * this method creates an Announce activity so the blog's followers are notified
+	 * about the interaction.
+	 *
+	 * @param string      $new_status The new comment status.
+	 * @param string      $old_status The old comment status.
+	 * @param \WP_Comment $comment    The comment object.
+	 */
+	public static function maybe_announce_interaction( $new_status, $old_status, $comment ) {
+		// Only if we're in both Blog and User modes.
+		if ( ACTIVITYPUB_ACTOR_AND_BLOG_MODE !== \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ) {
+			return;
+		}
+
+		if ( 'approved' !== $new_status || 'approved' === $old_status ) {
+			return;
+		}
+
+		if ( ! Comment_Utils::was_received( $comment ) ) {
+			return;
+		}
+
+		// Get activity from comment meta.
+		$activity = \get_comment_meta( $comment->comment_ID, '_activitypub_activity', true );
+
+		// Validate activity structure.
+		if ( ! $activity || ! \is_array( $activity ) ) {
+			return;
+		}
+
+		// Ensure object exists in the activity.
+		if ( empty( $activity['object'] ) || ! \is_array( $activity['object'] ) ) {
+			return;
+		}
+
+		// Get the blog actor.
+		$blog_actor = Actors::get_by_id( Actors::BLOG_USER_ID );
+		if ( ! $blog_actor || \is_wp_error( $blog_actor ) ) {
+			return;
+		}
+
+		$blog_actor_id = $blog_actor->get_id();
+
+		// Create the Announce activity.
+		$announce = new Activity();
+		$announce->set_type( 'Announce' );
+		$announce->set_actor( $blog_actor_id );
+		$announce->set_object( $activity );
+		$announce->set_to( array( $blog_actor_id ) );
+		$announce->set_cc( array( $blog_actor_id ) );
+
+		// Add to outbox with error handling.
+		add_to_outbox( $announce, null, Actors::BLOG_USER_ID, ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC );
+	}
+
 	/**
 	 * Schedule Comment Activities on insert.
 	 *

tests/phpunit/tests/includes/scheduler/class-test-comment.php

@@ -225,4 +225,251 @@ public function test_no_delete_activity_for_non_federated_comment() {
 
 		$this->assertEmpty( $outbox_posts, 'Should not create Delete activity for non-federated comment deletion' );
 	}
+
+	/**
+	 * Test that no announce is created when not in Blog and User mode.
+	 *
+	 * @covers ::maybe_announce_interaction
+	 */
+	public function test_no_announce_when_not_in_blog_and_user_mode() {
+		$post_id = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+
+		// Set actor mode to User only mode.
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE );
+
+		$activity = array(
+			'type'   => 'Create',
+			'actor'  => 'https://example.com/users/testuser',
+			'object' => array(
+				'type'    => 'Note',
+				'content' => 'Test comment content',
+			),
+		);
+
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => $post_id,
+				'comment_approved' => 0,
+				'comment_meta'     => array(
+					'protocol'              => 'activitypub',
+					'_activitypub_activity' => $activity,
+				),
+			)
+		);
+
+		// Get count of Announce activities before approval.
+		$before_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		\wp_set_comment_status( $comment_id, 'approve' );
+
+		// Get count after approval.
+		$after_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		$this->assertEquals( $before_count, $after_count, 'Should not create Announce when not in Blog and User mode' );
+
+		\wp_delete_comment( $comment_id, true );
+	}
+
+	/**
+	 * Test that no announce is created for non-received comments.
+	 *
+	 * @covers ::maybe_announce_interaction
+	 */
+	public function test_no_announce_for_non_received_comments() {
+		$post_id = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_AND_BLOG_MODE );
+
+		// Create a comment WITHOUT ActivityPub protocol meta (not received).
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => $post_id,
+				'comment_approved' => 0,
+			)
+		);
+
+		$before_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		\wp_set_comment_status( $comment_id, 'approve' );
+
+		$after_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		$this->assertEquals( $before_count, $after_count, 'Should not create Announce for non-received comments' );
+
+		\wp_delete_comment( $comment_id, true );
+	}
+
+	/**
+	 * Test that no announce is created when activity data is missing.
+	 *
+	 * @covers ::maybe_announce_interaction
+	 */
+	public function test_no_announce_when_activity_data_missing() {
+		$post_id = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_AND_BLOG_MODE );
+
+		// Create a comment with protocol meta but no activity data.
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => $post_id,
+				'comment_approved' => 0,
+				'comment_meta'     => array(
+					'protocol' => 'activitypub',
+				),
+			)
+		);
+
+		$before_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		\wp_set_comment_status( $comment_id, 'approve' );
+
+		$after_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		$this->assertEquals( $before_count, $after_count, 'Should not create Announce when activity data is missing' );
+
+		\wp_delete_comment( $comment_id, true );
+	}
+
+	/**
+	 * Test that no announce is created when activity is malformed.
+	 *
+	 * @covers ::maybe_announce_interaction
+	 */
+	public function test_no_announce_when_activity_malformed() {
+		$post_id = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_AND_BLOG_MODE );
+
+		// Create a comment with malformed activity (missing 'object' field).
+		$malformed_activity = array(
+			'type'  => 'Create',
+			'actor' => 'https://example.com/users/testuser',
+		);
+
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => $post_id,
+				'comment_approved' => 0,
+				'comment_meta'     => array(
+					'protocol'              => 'activitypub',
+					'_activitypub_activity' => $malformed_activity,
+				),
+			)
+		);
+
+		$before_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		\wp_set_comment_status( $comment_id, 'approve' );
+
+		$after_count = \count(
+			\get_posts(
+				array(
+					'post_type'   => Outbox::POST_TYPE,
+					'numberposts' => -1,
+					'meta_query'  => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+						array(
+							'key'   => '_activitypub_activity_type',
+							'value' => 'Announce',
+						),
+					),
+				)
+			)
+		);
+
+		$this->assertEquals( $before_count, $after_count, 'Should not create Announce when activity is malformed' );
+
+		\wp_delete_comment( $comment_id, true );
+	}
 }