Merge branch 'trunk' into trunk

Automattic · Feb 5, 2025 · 41e9481 · 41e9481
2 parents bc5f587 + 84c6cbf
commit 41e9481
Show file tree

Hide file tree

Showing 7 changed files with 259 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Manually granting `activitypub` cap no longer requires the receiving user to have `publish_post`.
+* Allow omitting replies in ActivityPub representations instead of setting them as empty.
 * Allow Base Transformer to handle WP_Term objects for transformation.
 
 ### Fixed

diff --git a/includes/class-query.php b/includes/class-query.php
@@ -104,7 +104,7 @@ public function get_activitypub_object() {
 	/**
 	 * Get the ActivityPub object ID.
 	 *
-	 * @return int The ActivityPub object ID.
+	 * @return string The ActivityPub object ID.
 	 */
 	public function get_activitypub_object_id() {
 		if ( $this->activitypub_object_id ) {

diff --git a/includes/collection/class-interactions.php b/includes/collection/class-interactions.php
@@ -106,7 +106,7 @@ public static function add_reaction( $activity ) {
 			$comment_post_id = $parent_comment->comment_post_ID;
 		}
 
-		if ( ! $comment_post_id ) {
+		if ( ! $comment_post_id || is_post_disabled( $comment_post_id ) ) {
 			// Not a reply to a post or comment.
 			return false;
 		}

diff --git a/includes/collection/class-replies.php b/includes/collection/class-replies.php
@@ -83,7 +83,7 @@ private static function get_id( $wp_object ) {
 	 *
 	 * @param WP_Post|WP_Comment $wp_object The post or comment to fetch replies for.
 	 *
-	 * @return array An associative array containing the replies collection without JSON-LD context.
+	 * @return array|null An associative array containing the replies collection without JSON-LD context.
 	 */
 	public static function get_collection( $wp_object ) {
 		$id = self::get_id( $wp_object );

diff --git a/includes/transformer/class-base.php b/includes/transformer/class-base.php
@@ -260,7 +260,7 @@ public function get_media_type() {
 	/**
 	 * Get the replies Collection.
 	 *
-	 * @return array The replies collection.
+	 * @return array|null The replies collection on success or null on failure.
 	 */
 	public function get_replies() {
 		return Replies::get_collection( $this->item );

diff --git a/readme.txt b/readme.txt
@@ -137,6 +137,7 @@ For reasons of data protection, it is not possible to see the followers of other
 * Added: Third-party plugins can filter settings tabs to add their own settings pages for ActivityPub.
 * Changed: Manually granting `activitypub` cap no longer requires the receiving user to have `publish_post`.
 * Changed: Allow Base Transformer to handle WP_Term objects for transformation.
+* Changed: Allow omitting replies in ActivityPub representations instead of setting them as empty.
 * Fixed: Negotiation of ActivityPub requests for custom post types when queried by the ActivityPub ID.
 * Fixed: Avoid PHP warnings when using Debug mode and when the `actor` is not set.
 * Fixed: No longer creates Outbox items when importing content/users.