Refactor actor lookup order for HTTP URIs (#2327)

Author: pfefferle

.github/changelog/2327-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Improved actor resolution by prioritizing blog actor detection before remote actor checks and refining home page URL handling.

includes/class-router.php

@@ -25,6 +25,8 @@ public static function init() {
 		\add_filter( 'redirect_canonical', array( self::class, 'redirect_canonical' ), 10, 2 );
 		\add_filter( 'redirect_canonical', array( self::class, 'no_trailing_redirect' ), 10, 2 );
 		\add_filter( 'query_vars', array( self::class, 'add_query_vars' ) );
+
+		\add_action( 'parse_query', array( self::class, 'fix_is_home_check' ) );
 	}
 
 	/**
@@ -281,4 +283,22 @@ public static function add_query_vars( $vars ) {
 
 		return $vars;
 	}
+
+	/**
+	 * Optimize home page query for ActivityPub requests.
+	 *
+	 * Skip the database query entirely for ActivityPub requests on the home page
+	 * since we only need to return the blog actor, not posts.
+	 *
+	 * @param \WP_Query $wp_query The WP_Query instance.
+	 */
+	public static function fix_is_home_check( $wp_query ) {
+		if (
+			$wp_query->get( 'actor' ) ||
+			$wp_query->get( 'stamp' ) ||
+			$wp_query->get( 'c' )
+		) {
+			$wp_query->is_home = false;
+		}
+	}
 }

includes/collection/class-actors.php

@@ -222,13 +222,6 @@ public static function get_id_by_resource( $uri ) {
 			// Check for http(s) URIs.
 			case 'http':
 			case 'https':
-				// Check locally stored remote Actor.
-				$post = Remote_Actors::get_by_uri( $uri );
-
-				if ( ! \is_wp_error( $post ) ) {
-					return $post->ID;
-				}
-
 				// Check for http(s)://blog.example.com/@username.
 				$resource_path = \wp_parse_url( $uri, PHP_URL_PATH );
 

tests/phpunit/tests/includes/class-test-query.php

@@ -518,4 +518,77 @@ public function test_maybe_get_stamp_invalid_author() {
 		// Clean up.
 		\wp_delete_post( $post_id, true );
 	}
+
+	/**
+	 * Test get_activitypub_object method for home page in Actor mode.
+	 *
+	 * @covers ::get_activitypub_object
+	 */
+	public function test_home_page_actor_mode() {
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE );
+
+		$actor_queries = array();
+
+		// Track database queries using the 'query' filter.
+		$query_filter = function ( $query ) use ( &$actor_queries ) {
+			if ( strpos( $query, 'ap_actor' ) !== false ) {
+				$actor_queries[] = $query;
+			}
+			return $query;
+		};
+
+		add_filter( 'query', $query_filter );
+
+		Query::get_instance()->__destruct();
+		$this->go_to( home_url( '/' ) );
+		$object = Query::get_instance()->get_activitypub_object();
+
+		remove_filter( 'query', $query_filter );
+
+		$message = 'Should not query Remote_Actors table for home page.';
+		if ( ! empty( $actor_queries ) ) {
+			$message .= ' Found queries: ' . wp_json_encode( $actor_queries );
+		}
+
+		$this->assertNull( $object, 'Home page should return null, because the Blog user is disabled.' );
+		$this->assertEmpty( $actor_queries, $message );
+
+		\delete_option( 'activitypub_actor_mode' );
+	}
+
+	/**
+	 * Test get_activitypub_object method for home page in Actor and Blog mode.
+	 *
+	 * @covers ::get_activitypub_object
+	 */
+	public function test_home_page_actor_and_blog_mode() {
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_AND_BLOG_MODE );
+		$actor_queries = array();
+
+		// Track database queries using the 'query' filter.
+		$query_filter = function ( $query ) use ( &$actor_queries ) {
+			if ( strpos( $query, 'ap_actor' ) !== false ) {
+				$actor_queries[] = $query;
+			}
+			return $query;
+		};
+
+		\add_filter( 'query', $query_filter );
+
+		Query::get_instance()->__destruct();
+		$this->go_to( home_url( '/' ) );
+		$object = Query::get_instance()->get_activitypub_object();
+
+		\remove_filter( 'query', $query_filter );
+
+		$message = 'Should not query Remote_Actors table for home page.';
+		if ( ! empty( $actor_queries ) ) {
+			$message .= ' Found queries: ' . wp_json_encode( $actor_queries );
+		}
+
+		$this->assertNotNull( $object, 'Home page should return an object' );
+		$this->assertEmpty( $actor_queries, $message );
+
+		\delete_option( 'activitypub_actor_mode' );
+	}
 }