Add URI transformer (#1292)

* Add URI transformer

* Migrate a URL to an object

* Simplify code

* Fix tests

* Simplify code

* Add changelog

* use WPError assertion

props @obenland

* phpcs fixes

* removed unused transformer

* update changelog

Author: pfefferle

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * The Outbox purging routine no longer is limited to deleting 5 items at a time.
 * Undo API for Outbox items.
+* Allow Activities on URLs instead of requiring Activity-Objects. This is useful especially for sending Announces and Likes.
 
 ## [5.2.0] - 2025-02-13
 

includes/class-http.php

@@ -235,24 +235,7 @@ public static function generate_cache_key( $url ) {
 	 * @return array|WP_Error The Object data as array or WP_Error on failure.
 	 */
 	public static function get_remote_object( $url_or_object, $cached = true ) {
-		if ( is_array( $url_or_object ) ) {
-			if ( array_key_exists( 'id', $url_or_object ) ) {
-				$url = $url_or_object['id'];
-			} elseif ( array_key_exists( 'url', $url_or_object ) ) {
-				$url = $url_or_object['url'];
-			} else {
-				return new WP_Error(
-					'activitypub_no_valid_actor_identifier',
-					\__( 'The "actor" identifier is not valid', 'activitypub' ),
-					array(
-						'status' => 404,
-						'object' => $url_or_object,
-					)
-				);
-			}
-		} else {
-			$url = $url_or_object;
-		}
+		$url = object_to_uri( $url_or_object );
 
 		if ( preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $url ) ) {
 			$url = Webfinger::resolve( $url );

includes/functions.php

@@ -797,6 +797,10 @@ function object_to_uri( $data ) {
 		return $data;
 	}
 
+	if ( is_object( $data ) ) {
+		$data = $data->to_array();
+	}
+
 	/*
 	 * Check if it is a list, then take first item.
 	 * This plugin does not support collections.

includes/transformer/class-factory.php

@@ -8,6 +8,7 @@
 namespace Activitypub\Transformer;
 
 use WP_Error;
+use Activitypub\Http;
 use Activitypub\Comment as Comment_Helper;
 
 use function Activitypub\is_user_disabled;
@@ -25,7 +26,16 @@ class Factory {
 	 * @return Base|WP_Error The transformer to use, or an error.
 	 */
 	public static function get_transformer( $data ) {
-		if ( \is_array( $data ) || \is_string( $data ) ) {
+		if ( \is_string( $data ) && \filter_var( $data, FILTER_VALIDATE_URL ) ) {
+			$response = Http::get_remote_object( $data );
+
+			if ( \is_wp_error( $response ) ) {
+				return $response;
+			}
+
+			$class = 'json';
+			$data  = $response;
+		} elseif ( \is_array( $data ) || \is_string( $data ) ) {
 			$class = 'json';
 		} elseif ( \is_object( $data ) ) {
 			$class = \get_class( $data );

readme.txt

@@ -131,6 +131,7 @@ For reasons of data protection, it is not possible to see the followers of other
 
 = Unreleased =
 
+* Added: Allow Activities on URLs instead of requiring Activity-Objects. This is useful especially for sending Announces and Likes.
 * Added: Undo API for Outbox items.
 * Added: Setting to adjust the number of days Outbox items are kept before being purged.
 * Fixed: The Outbox purging routine no longer is limited to deleting 5 items at a time.

tests/includes/transformer/class-test-factory.php

@@ -214,4 +214,53 @@ function () {
 
 		remove_all_filters( 'activitypub_transformer' );
 	}
+
+	/**
+	 * Test successful URI transformation.
+	 */
+	public function test_successful_uri_transformation() {
+		// Mock-Daten für die HTTP-Antwort.
+		$fake_request = function () {
+			return array(
+				'response' => array( 'code' => 200 ),
+				'body'     => wp_json_encode(
+					array(
+						'id'      => 'https://example.com/activity/1',
+						'type'    => 'Note',
+						'content' => 'Test Content',
+					)
+				),
+			);
+		};
+
+		add_filter( 'pre_http_request', $fake_request, 10 );
+
+		$uri_transformer = Factory::get_transformer( 'https://example.com/activity/1' );
+		$result          = $uri_transformer->to_object();
+
+		$this->assertIsObject( $result );
+		$this->assertEquals( 'https://example.com/activity/1', $result->get_id() );
+		$this->assertEquals( 'Note', $result->get_type() );
+		$this->assertEquals( 'Test Content', $result->get_content() );
+
+		remove_filter( 'pre_http_request', $fake_request, 10 );
+	}
+
+	/**
+	 * Test URI transformation with error.
+	 */
+	public function test_uri_transformation_error() {
+		// WP_Error für fehlgeschlagene Anfrage erstellen.
+		$fake_request = function () {
+			return new \WP_Error( 'fetch_error', 'Failed to fetch remote object' );
+		};
+
+		add_filter( 'pre_http_request', $fake_request, 10 );
+
+		$uri_transformer = Factory::get_transformer( 'https://example.com/invalid' );
+
+		$this->assertWPError( $uri_transformer );
+
+		remove_filter( 'pre_http_request', $fake_request, 10 );
+	}
 }