Fix Reader URL generation for WPCOM environment (#2250)

Author: pfefferle

integration/class-jetpack.php

@@ -96,7 +96,11 @@ public static function add_reader_link( $actions, $item ) {
 
 		$feed = \get_post_meta( $item['id'], '_activitypub_actor_feed', true );
 
-		if ( isset( $feed['feed_id'] ) ) {
+		// Generate Reader URL based on environment.
+		if ( \defined( 'IS_WPCOM' ) && IS_WPCOM ) {
+			if ( empty( $feed['feed_id'] ) ) {
+				return $actions; // No feed_id available on WPCOM.
+			}
 			$url = sprintf( 'https://wordpress.com/reader/feed/%d', (int) $feed['feed_id'] );
 		} else {
 			$url = sprintf( 'https://wordpress.com/reader/feeds/lookup/%s', rawurlencode( $item['identifier'] ) );

tests/integration/class-test-jetpack.php

@@ -323,6 +323,8 @@ public function reader_link_data() {
 	 *
 	 * @dataProvider reader_link_data
 	 * @covers ::add_reader_link
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 *
 	 * @param array       $item                    The following item.
 	 * @param int|false   $feed_id                 The feed ID or false.
@@ -332,6 +334,12 @@ public function reader_link_data() {
 	public function test_add_reader_link( $item, $feed_id, $expected_url, $should_have_reader_link ) {
 		$original_actions = array( 'edit' => '<a href="#">Edit</a>' );
 
+		// Set up WPCOM environment if expecting WPCOM-style URL.
+		$is_wpcom_test = $expected_url && strpos( $expected_url, '/reader/feed/' ) !== false;
+		if ( $is_wpcom_test && ! defined( 'IS_WPCOM' ) ) {
+			define( 'IS_WPCOM', true );
+		}
+
 		// Mock the feed ID meta if provided.
 		if ( false !== $feed_id ) {
 			add_filter(