Add WP-CLI command to reprocess inbox items (#2500)

Co-authored-by: Matthias Pfefferle <pfefferle@users.noreply.github.com>

Author: obenland

includes/handler/class-create.php

@@ -78,15 +78,7 @@ public static function create_interaction( $activity, $user_ids, $activity_objec
 
 		// If comment exists, call update action.
 		if ( $check_dupe ) {
-			/**
-			 * Fires when a Create activity is received for an existing comment.
-			 *
-			 * @param array                          $activity        The activity-object.
-			 * @param int[]                          $user_ids        The ids of the local blog-users.
-			 * @param \Activitypub\Activity\Activity $activity_object The activity object.
-			 */
-			\do_action( 'activitypub_inbox_update', $activity, (array) $user_ids, $activity_object );
-			return false;
+			return Update::handle_update( $activity, (array) $user_ids, $activity_object );
 		}
 
 		if ( is_self_ping( $activity['object']['id'] ) ) {
@@ -116,15 +108,7 @@ public static function create_post( $activity, $user_ids, $activity_object = nul
 
 		// If comment exists, call update action.
 		if ( ! \is_wp_error( $check_dupe ) ) {
-			/**
-			 * Fires when a Create activity is received for an existing object.
-			 *
-			 * @param array                          $activity        The activity-object.
-			 * @param int[]                          $user_ids        The id of the local blog-user.
-			 * @param \Activitypub\Activity\Activity $activity_object The activity object.
-			 */
-			\do_action( 'activitypub_inbox_update', $activity, (array) $user_ids, $activity_object );
-			return false;
+			return Update::handle_update( $activity, (array) $user_ids, $activity_object );
 		}
 
 		return Posts::add( $activity, $user_ids );

includes/handler/class-update.php

@@ -104,15 +104,7 @@ public static function update_object( $activity, $user_ids, $activity_object ) {
 
 		// There is no object to update, try to trigger create instead.
 		if ( ! $updated ) {
-			/**
-			 * Fires when a Create activity is received for an existing object.
-			 *
-			 * @param array                          $activity        The activity-object.
-			 * @param int[]                          $user_ids        The ids of the local blog-users.
-			 * @param \Activitypub\Activity\Activity $activity_object The activity object.
-			 */
-			\do_action( 'activitypub_inbox_create', $activity, $user_ids, $activity_object );
-			return false;
+			return Create::handle_create( $activity, $user_ids, $activity_object );
 		}
 
 		$success = ( $result && ! \is_wp_error( $result ) );

local/class-cli.php

@@ -7,9 +7,12 @@
 
 namespace Activitypub\Development;
 
+use Activitypub\Activity\Activity;
 use Activitypub\Collection\Followers;
+use Activitypub\Collection\Inbox;
 use Activitypub\Comment;
 
+use function Activitypub\camel_to_snake_case;
 use function WP_CLI\Utils\get_flag_value;
 use function WP_CLI\Utils\make_progress_bar;
 
@@ -168,4 +171,72 @@ private function generate_comments( $args, $assoc_args ) {
 			$notify->finish();
 		}
 	}
+
+	/**
+	 * Reprocess an inbox item.
+	 *
+	 * ## OPTIONS
+	 *
+	 * <post_id>
+	 * : The post ID of the ap_inbox item to reprocess.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     # Reprocess inbox item with ID 123
+	 *     $ wp activitypub reprocess_inbox 123
+	 *     Success: Inbox item 123 has been reprocessed.
+	 *
+	 * @param array $args The arguments.
+	 */
+	public function reprocess_inbox( $args ) {
+		$post_id = absint( $args[0] );
+
+		if ( ! $post_id ) {
+			\WP_CLI::error( 'Invalid post ID provided.' );
+		}
+
+		$post = Inbox::get( $post_id );
+
+		if ( ! $post ) {
+			\WP_CLI::error( sprintf( 'Post with ID %d not found.', $post_id ) );
+		}
+
+		\WP_CLI::log( sprintf( 'Reprocessing inbox item %d...', $post_id ) );
+
+		// Get the activity data from the inbox post.
+		$activity_data = json_decode( $post->post_content, true );
+
+		if ( ! $activity_data ) {
+			\WP_CLI::error( 'Failed to decode activity data.' );
+		}
+
+		// Get the activity type.
+		if ( ! isset( $activity_data['type'] ) ) {
+			\WP_CLI::error( 'Activity data does not contain a type field.' );
+		}
+
+		$type = camel_to_snake_case( $activity_data['type'] );
+
+		// Get recipients from post meta.
+		$user_ids = Inbox::get_recipients( $post_id );
+
+		if ( empty( $user_ids ) ) {
+			\WP_CLI::error( 'No recipients found for this inbox item.' );
+		}
+
+		// Create Activity object from the activity data.
+		$activity = Activity::init_from_array( $activity_data );
+
+		if ( \is_wp_error( $activity ) ) {
+			\WP_CLI::error( sprintf( 'Failed to initialize activity: %s', $activity->get_error_message() ) );
+		}
+
+		// Trigger both sets of action hooks that handlers may be registered on.
+		\do_action( 'activitypub_inbox', $activity_data, $user_ids, $type, $activity, Inbox::CONTEXT_INBOX );
+		\do_action( 'activitypub_inbox_' . $type, $activity_data, $user_ids, $activity, Inbox::CONTEXT_INBOX );
+		\do_action( 'activitypub_handled_inbox', $activity_data, $user_ids, $type, $activity, $post_id, Inbox::CONTEXT_INBOX );
+		\do_action( 'activitypub_handled_inbox_' . $type, $activity_data, $user_ids, $activity, $post_id, Inbox::CONTEXT_INBOX );
+
+		\WP_CLI::success( sprintf( 'Inbox item %d has been reprocessed as %s activity.', $post_id, $activity_data['type'] ) );
+	}
 }

local/load.php

@@ -34,3 +34,5 @@
 
 // Defer signature verification on local development to better test API requests.
 \add_filter( 'activitypub_defer_signature_verification', '__return_true', 20 );
+
+\add_filter( 'option_activitypub_create_posts', '__return_true' );

tests/phpunit/tests/includes/handler/class-test-update.php

@@ -20,7 +20,7 @@
 class Test_Update extends \WP_UnitTestCase {
 
 	/**
-	 * Test that the activitypub_inbox_create fallback is triggered.
+	 * Test that the activitypub_handled_create fallback is triggered.
 	 */
 	public function test_activitypub_inbox_create_fallback() {
 		\update_option( 'activitypub_create_posts', true );
@@ -35,31 +35,32 @@ public function test_activitypub_inbox_create_fallback() {
 			'type'   => 'Update',
 			'actor'  => $test_actor,
 			'object' => array(
-				'id'      => 'https://example.com/objects/12345',
-				'type'    => 'Note',
-				'content' => 'Test note',
+				'id'           => 'https://example.com/objects/12345',
+				'type'         => 'Note',
+				'content'      => 'Test note',
+				'attributedTo' => $test_actor,
 			),
 		);
 
 		// Add a fallback handler for the action.
 		\add_action(
-			'activitypub_inbox_create',
+			'activitypub_handled_create',
 			function ( $activity_data ) use ( &$called, $test_actor ) {
 				if ( isset( $activity_data['actor'] ) && $activity_data['actor'] === $test_actor ) {
 					$called = true;
 				}
 			},
 			10,
-			3
+			4
 		);
 
-		// Call the handler via the new handled_inbox_update hook.
+		// Call the handler via the handled_inbox_update hook.
 		\do_action( 'activitypub_handled_inbox_update', $activity, array( $this->user_id ), null );
 
-		$this->assertTrue( $called, 'The fallback activitypub_inbox_create action should be triggered.' );
+		$this->assertTrue( $called, 'The fallback activitypub_handled_create action should be triggered.' );
 
 		// Clean up by removing the action.
-		\remove_all_actions( 'activitypub_inbox_create' );
+		\remove_all_actions( 'activitypub_handled_create' );
 		\remove_all_actions( 'activitypub_handled_inbox_update' );
 		\delete_option( 'activitypub_create_posts' );
 	}