Merge branch 'trunk' into fix/outbox-object-id

Author: pfefferle

.github/changelog/1516-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Use the `$from` account for the object in Move activity for internal Moves

.github/changelog/1517-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Prevent self-replies on local comments.

includes/class-dispatcher.php

@@ -335,6 +335,11 @@ public static function add_inboxes_of_replied_urls( $inboxes, $actor_id, $activi
 		}
 
 		foreach ( $in_reply_to as $url ) {
+			// No need to self-notify.
+			if ( is_same_domain( $url ) ) {
+				continue;
+			}
+
 			$object = Http::get_remote_object( $url );
 
 			if (

includes/class-move.php

@@ -130,7 +130,7 @@ public static function internally( $from, $to ) {
 		$activity->set_type( 'Move' );
 		$activity->set_actor( $actor );
 		$activity->set_origin( $actor );
-		$activity->set_object( $to );
+		$activity->set_object( $actor );
 		$activity->set_target( $to );
 
 		return add_to_outbox( $activity, null, $user->get__id(), ACTIVITYPUB_CONTENT_VISIBILITY_QUIET_PUBLIC );

tests/includes/class-test-dispatcher.php

@@ -344,4 +344,84 @@ public function add_follower( $pre, $actor ) {
 			'endpoints'         => array( 'sharedInbox' => 'https://example.org/sharedInbox' ),
 		);
 	}
+
+	/**
+	 * Test that in_reply_to URLs from the same domain are ignored.
+	 *
+	 * @covers ::add_inboxes_of_replied_urls
+	 */
+	public function test_ignore_same_domain_in_reply_to() {
+		// Create a test activity with in_reply_to pointing to same domain.
+		$activity = new Activity();
+		$activity->set_type( 'Create' );
+		$activity->set_id( 'https://example.com/test-id' );
+		$activity->set_in_reply_to( 'https://example.com/post/123' );
+
+		// Create a test actor.
+		$actor_id = self::$user_id;
+
+		// Get inboxes for the activity.
+		$inboxes = Dispatcher::add_inboxes_of_replied_urls( array(), $actor_id, $activity );
+
+		// Verify that no inboxes were added since the in_reply_to is from same domain.
+		$this->assertEmpty( $inboxes, 'Inboxes should be empty for same domain in_reply_to URLs' );
+	}
+
+	/**
+	 * Test that in_reply_to URLs from different domains are processed.
+	 *
+	 * @covers ::add_inboxes_of_replied_urls
+	 */
+	public function test_process_different_domain_in_reply_to() {
+		// Create a test activity with in_reply_to pointing to different domain.
+		$activity = new Activity();
+		$activity->set_type( 'Create' );
+		$activity->set_id( 'https://example.com/test-id' );
+		$activity->set_in_reply_to( 'https://mastodon.social/@user/123456789' );
+
+		// Create a test actor.
+		$actor_id = self::$user_id;
+
+		$callback = function ( $pre, $parsed_args, $url ) {
+			if ( 'https://mastodon.social/@user/123456789' === $url ) {
+				return array(
+					'response' => array( 'code' => 200 ),
+					'body'     => \wp_json_encode(
+						array(
+							'type'         => 'Note',
+							'id'           => 'https://mastodon.social/@user/123456789',
+							'attributedTo' => 'https://mastodon.social/@user',
+						)
+					),
+				);
+			}
+
+			if ( 'https://mastodon.social/@user' === $url ) {
+				return array(
+					'response' => array( 'code' => 200 ),
+					'body'     => \wp_json_encode(
+						array(
+							'type'  => 'Person',
+							'id'    => 'https://mastodon.social/@user',
+							'inbox' => 'https://mastodon.social/inbox',
+						)
+					),
+				);
+			}
+
+			return $pre;
+		};
+
+		// Mock the HTTP response for the remote object.
+		add_filter( 'pre_http_request', $callback, 10, 3 );
+
+		// Get inboxes for the activity.
+		$inboxes = Dispatcher::add_inboxes_of_replied_urls( array(), $actor_id, $activity );
+
+		// Verify that the inbox was added.
+		$this->assertContains( 'https://mastodon.social/inbox', $inboxes, 'Inbox should be added for different domain in_reply_to URLs' );
+
+		// Clean up.
+		remove_filter( 'pre_http_request', $callback );
+	}
 }

tests/includes/class-test-move.php

@@ -160,4 +160,38 @@ public function test_internally_with_valid_input() {
 		$also_known_as = Actors::get_by_id( self::$user_id )->get_also_known_as();
 		$this->assertContains( $from, $also_known_as );
 	}
+
+	/**
+	 * Test that the Move Activity created by internally() has the correct properties.
+	 *
+	 * @covers ::internally
+	 */
+	public function test_internally_activity_object_properties() {
+		$from = get_author_posts_url( self::$user_id );
+		$to   = Actors::get_by_id( self::$user_id )->get_id();
+
+		// Call the method and get the outbox item ID.
+		$outbox_id = \Activitypub\Move::internally( $from, $to );
+
+		// Verify we got a valid outbox ID.
+		$this->assertIsInt( $outbox_id );
+
+		// Get the outbox item from the database.
+		$outbox_item = get_post( $outbox_id );
+
+		// Verify the outbox item exists.
+		$this->assertNotNull( $outbox_item );
+
+		// Get the activity JSON from the outbox item.
+		$activity = json_decode( $outbox_item->post_content );
+
+		// Verify the activity type is Move.
+		$this->assertEquals( 'Move', $activity->type );
+
+		// Verify the activity object is set to the actor, not the target.
+		$this->assertEquals( $from, $activity->object );
+		$this->assertEquals( $from, $activity->actor );
+		$this->assertEquals( $from, $activity->origin );
+		$this->assertEquals( $to, $activity->target );
+	}
 }