Suggest/object (#1523)

* Update with activities

* Remove comments as the function gets used recursively now

---------

Co-authored-by: Konstantin Obenland <obenland@gmx.de>

Author: pfefferle

includes/collection/class-outbox.php

@@ -7,10 +7,10 @@
 
 namespace Activitypub\Collection;
 
+use Activitypub\Activity\Base_Object;
 use Activitypub\Dispatcher;
 use Activitypub\Scheduler;
 use Activitypub\Activity\Activity;
-use Activitypub\Activity\Generic_Object;
 use function Activitypub\add_to_outbox;
 
 /**
@@ -296,34 +296,28 @@ public static function maybe_get_activity( $outbox_item ) {
 	/**
 	 * Get the object ID of an activity.
 	 *
-	 * @param Generic_Object $data The activity object.
+	 * @param Activity|Base_Object|string $data The activity object.
 	 *
 	 * @return string The object ID.
 	 */
 	private static function get_object_id( $data ) {
-		// If the object is an array, convert it to a Generic_Object.
-		if ( is_array( $data->get_object() ) ) {
-			$data->set_object( Generic_Object::init_from_array( $data->get_object() ) );
-		}
+		$object = $data->get_object();
 
-		// Most common.
-		if ( is_object( $data->get_object() ) ) {
-			return self::get_object_id( $data->get_object() );
+		if ( is_object( $object ) ) {
+			return self::get_object_id( $object );
 		}
 
-		// Rare.
-		if ( is_string( $data->get_object() ) ) {
-			return $data->get_object();
+		if ( is_string( $object ) ) {
+			return $object;
 		}
 
-		// Exceptional.
 		return $data->get_id() ?? $data->get_actor();
 	}
 
 	/**
 	 * Get the title of an activity recursively.
 	 *
-	 * @param \Activitypub\Activity\Base_Object $activity_object The activity object.
+	 * @param Base_Object $activity_object The activity object.
 	 *
 	 * @return string The title.
 	 */
@@ -340,7 +334,7 @@ private static function get_object_title( $activity_object ) {
 
 		$title = $activity_object->get_name() ?? $activity_object->get_content();
 
-		if ( ! $title && $activity_object->get_object() instanceof \Activitypub\Activity\Base_Object ) {
+		if ( ! $title && $activity_object->get_object() instanceof Base_Object ) {
 			$title = $activity_object->get_object()->get_name() ?? $activity_object->get_object()->get_content();
 		}
 

tests/includes/collection/class-test-outbox.php

@@ -289,12 +289,10 @@ public function test_delete_invalidates_all_activities() {
 	 * @dataProvider data_provider_get_object_id
 	 * @covers ::get_object_id
 	 *
-	 * @param array  $activity_data The activity data to test.
-	 * @param string $expected      The expected object ID.
+	 * @param Activity $activity The activity data to test.
+	 * @param string   $expected The expected object ID.
 	 */
-	public function test_get_object_id( $activity_data, $expected ) {
-		$activity = Generic_Object::init_from_array( $activity_data );
-
+	public function test_get_object_id( $activity, $expected ) {
 		// Get the object ID using reflection since it's a private method.
 		$get_object_id = new \ReflectionMethod( Outbox::class, 'get_object_id' );
 		$get_object_id->setAccessible( true );
@@ -310,64 +308,67 @@ public function test_get_object_id( $activity_data, $expected ) {
 	 * @return array
 	 */
 	public function data_provider_get_object_id() {
+		$create_with_id = Activity::init_from_array(
+			array(
+				'type'   => 'Create',
+				'object' => array(
+					'type' => 'Note',
+					'id'   => 'https://example.com/note/123',
+				),
+			)
+		);
+		$create_no_id   = Activity::init_from_array(
+			array(
+				'type'   => 'Create',
+				'object' => array(
+					'type'    => 'Note',
+					'content' => 'Test content',
+				),
+			)
+		);
+
 		return array(
 			'object is a string'             => array(
-				'activity' => array(
-					'type'   => 'Create',
-					'object' => 'https://example.com/note/123',
+				'activity' => Activity::init_from_array(
+					array(
+						'type'   => 'Create',
+						'object' => 'https://example.com/note/123',
+					)
 				),
 				'expected' => 'https://example.com/note/123',
 			),
 			'object is an object with id'    => array(
-				'activity' => array(
-					'type'   => 'Create',
-					'object' => array(
-						'type' => 'Note',
-						'id'   => 'https://example.com/note/123',
-					),
-				),
+				'activity' => $create_with_id,
 				'expected' => 'https://example.com/note/123',
 			),
 			'object is an object without id' => array(
-				'activity' => array(
-					'type'   => 'Create',
-					'object' => array(
-						'type'    => 'Note',
-						'content' => 'Test content',
-					),
-				),
+				'activity' => $create_no_id,
 				'expected' => null, // Will use activity ID as fallback.
 			),
 			'nested object with id'          => array(
-				'activity' => array(
-					'type'   => 'Create',
-					'object' => array(
-						'type'   => 'Article',
-						'object' => array(
-							'type' => 'Note',
-							'id'   => 'https://example.com/note/123',
-						),
-					),
+				'activity' => Activity::init_from_array(
+					array(
+						'type'   => 'Announce',
+						'object' => $create_with_id,
+					)
 				),
 				'expected' => 'https://example.com/note/123',
 			),
 			'nested object without id'       => array(
-				'activity' => array(
-					'type'   => 'Create',
-					'object' => array(
-						'type'   => 'Article',
-						'object' => array(
-							'type'    => 'Note',
-							'content' => 'Test content',
-						),
-					),
+				'activity' => Activity::init_from_array(
+					array(
+						'type'   => 'Announce',
+						'object' => $create_no_id,
+					)
 				),
 				'expected' => null, // Will use activity ID as fallback.
 			),
 			'activity with no object'        => array(
-				'activity' => array(
-					'type'  => 'Delete',
-					'actor' => 'https://example.com/user/1',
+				'activity' => Activity::init_from_array(
+					array(
+						'type'  => 'Delete',
+						'actor' => 'https://example.com/user/1',
+					)
 				),
 				'expected' => 'https://example.com/user/1', // Will use actor as fallback.
 			),