Merge branch 'trunk' into add/reader

obenland · web-flow · commit 382fcbcb8ef8 · 2025-11-21T08:28:37.000-06:00
diff --git a/.github/changelog/2508-from-description b/.github/changelog/2508-from-description
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Store comments and reactions from followed actors on reader posts, and keep them separate from your site's comments in wp-admin.
diff --git a/.github/changelog/2517-from-description b/.github/changelog/2517-from-description
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix make_clickable corrupting existing anchor tags in ActivityPub content
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ jobs:
     name: Deploy to WP.org
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install SVN
         run: |
           sudo apt-get update
diff --git a/.github/workflows/extract-wp-hooks.yml b/.github/workflows/extract-wp-hooks.yml
@@ -14,7 +14,7 @@ jobs:
     permissions:
       contents: write # Required to push to wiki repository
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: akirk/extract-wp-hooks@1.3.0
         with:
           namespace: 'Activitypub'
diff --git a/.github/workflows/gardening.yml b/.github/workflows/gardening.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node
         uses: actions/setup-node@v6
diff --git a/.github/workflows/jest.yml b/.github/workflows/jest.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -46,7 +46,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install subversion
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -84,7 +84,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install subversion
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP with Xdebug
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
diff --git a/includes/class-comment.php b/includes/class-comment.php
@@ -8,6 +8,7 @@
 namespace Activitypub;
 
 use Activitypub\Collection\Actors;
+use Activitypub\Collection\Posts;
 
 /**
  * ActivityPub Comment Class.
@@ -701,8 +702,16 @@ public static function comment_query( $query ) {
 			return;
 		}
 
-		// Do not exclude likes and reposts on admin pages or on non-singular pages.
-		if ( is_admin() || ! is_singular() ) {
+		// Do only exclude interactions of `ap_post` post type.
+		if ( \is_admin() ) {
+			if ( \get_option( 'activitypub_create_posts', false ) ) {
+				$query->query_vars['post_type'] = array_diff( \get_post_types_by_support( 'comments' ), array( Posts::POST_TYPE ) );
+			}
+			return;
+		}
+
+		// Do not exclude likes and reposts on non-singular pages.
+		if ( ! \is_singular() ) {
 			return;
 		}
 
diff --git a/includes/class-sanitize.php b/includes/class-sanitize.php
@@ -191,7 +191,11 @@ public static function webfinger( $value ) {
 	 * @return string The converted content.
 	 */
 	public static function content( $content ) {
-		$content = \make_clickable( $content );
+		// Only make URLs clickable if no anchor tags exist, to avoid corrupting existing links.
+		if ( false === \strpos( $content, '<a ' ) ) {
+			$content = \make_clickable( $content );
+		}
+
 		$content = \wpautop( $content );
 		$content = \wp_kses_post( $content );
 
diff --git a/includes/collection/class-interactions.php b/includes/collection/class-interactions.php
@@ -12,6 +12,7 @@
 use WP_Comment_Query;
 
 use function Activitypub\get_remote_metadata_by_actor;
+use function Activitypub\is_ap_post;
 use function Activitypub\is_post_disabled;
 use function Activitypub\object_id_to_comment;
 use function Activitypub\object_to_uri;
@@ -67,16 +68,20 @@ public static function add_comment( $activity ) {
 		$target_url      = \esc_url_raw( $target_url );
 		$comment_post_id = \url_to_postid( $target_url );
 
+		if ( ! $comment_post_id ) {
+			// Check for `ap_post`.
+			$comment_post = Posts::get_by_guid( $target_url );
+			if ( $comment_post instanceof \WP_Post ) {
+				$comment_post_id = $comment_post->ID;
+			}
+		}
+
 		// Handle nested replies (replies to comments).
 		if ( ! $comment_post_id && $parent_comment_id ) {
 			$parent_comment  = \get_comment( $parent_comment_id );
 			$comment_post_id = $parent_comment->comment_post_ID;
 		}
 
-		if ( is_post_disabled( $comment_post_id ) ) {
-			return false;
-		}
-
 		$comment_data['comment_post_ID'] = $comment_post_id;
 		$comment_data['comment_parent']  = $parent_comment_id ? $parent_comment_id : 0;
 
@@ -120,12 +125,20 @@ public static function add_reaction( $activity ) {
 		$comment_post_id   = \url_to_postid( $url );
 		$parent_comment_id = url_to_commentid( $url );
 
+		if ( ! $comment_post_id ) {
+			// Check for `ap_post`.
+			$comment_post = Posts::get_by_guid( $url );
+			if ( $comment_post instanceof \WP_Post ) {
+				$comment_post_id = $comment_post->ID;
+			}
+		}
+
 		if ( ! $comment_post_id && $parent_comment_id ) {
 			$parent_comment  = \get_comment( $parent_comment_id );
 			$comment_post_id = $parent_comment->comment_post_ID;
 		}
 
-		if ( ! $comment_post_id || is_post_disabled( $comment_post_id ) ) {
+		if ( ! $comment_post_id ) {
 			// Not a reply to a post or comment.
 			return false;
 		}
@@ -385,6 +398,13 @@ public static function activity_to_comment( $activity ) {
 	 * @return array|string|int|\WP_Error|false The comment data or false on failure
 	 */
 	public static function persist( $comment_data, $action = self::INSERT ) {
+		if (
+			is_post_disabled( $comment_data['comment_post_ID'] ) &&
+			! is_ap_post( $comment_data['comment_post_ID'] )
+		) {
+			return false;
+		}
+
 		// Disable flood control.
 		\remove_action( 'check_comment_flood', 'check_comment_flood_db' );
 		// Do not require email for AP entries.
diff --git a/includes/functions.php b/includes/functions.php
@@ -14,6 +14,7 @@
 use Activitypub\Collection\Followers;
 use Activitypub\Collection\Following;
 use Activitypub\Collection\Outbox;
+use Activitypub\Collection\Posts;
 use Activitypub\Collection\Remote_Actors;
 use Activitypub\Transformer\Factory as Transformer_Factory;
 
@@ -350,6 +351,24 @@ function is_post_disabled( $post ) {
 	return \apply_filters( 'activitypub_is_post_disabled', $disabled, $post );
 }
 
+/**
+ * Check if a post is an ActivityPub post.
+ *
+ * @param mixed $post The post object or ID.
+ *
+ * @return boolean True if the post is an ActivityPub post, false otherwise.
+ */
+function is_ap_post( $post ) {
+	$post = \get_post( $post );
+
+	if ( ! $post ) {
+		return false;
+	}
+
+	// Check for ap_post post type.
+	return Posts::POST_TYPE === $post->post_type;
+}
+
 /**
  * This function checks if a user is enabled for ActivityPub.
  *
diff --git a/tests/phpunit/tests/includes/class-test-comment.php b/tests/phpunit/tests/includes/class-test-comment.php
diff --git a/tests/phpunit/tests/includes/class-test-functions.php b/tests/phpunit/tests/includes/class-test-functions.php
diff --git a/tests/phpunit/tests/includes/class-test-sanitize.php b/tests/phpunit/tests/includes/class-test-sanitize.php
diff --git a/tests/phpunit/tests/includes/collection/class-test-interactions.php b/tests/phpunit/tests/includes/collection/class-test-interactions.php
