Interactions: Don't show likes and reposts for comments (#1735)

Author: obenland

.github/changelog/1735-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Likes and Reposts for comments to a post are no longer attributed to the post itself.

includes/class-mailer.php

@@ -88,8 +88,26 @@ public static function comment_notification_text( $message, $comment_id ) {
 		$post                  = \get_post( $comment->comment_post_ID );
 		$comment_author_domain = \gethostbyaddr( $comment->comment_author_IP );
 
-		/* translators: 1: Comment type, 2: Post title */
-		$notify_message = \sprintf( html_entity_decode( esc_html__( 'New %1$s on your post “%2$s”.', 'activitypub' ) ), \esc_html( $comment_type['singular'] ), \esc_html( $post->post_title ) ) . "\r\n\r\n";
+		// Check if this is a reaction to a post or a comment.
+		if ( 0 === (int) $comment->comment_parent ) {
+			$notify_message = \sprintf(
+				/* translators: 1: Comment type, 2: Post title */
+				\html_entity_decode( esc_html__( 'New %1$s on your post “%2$s”.', 'activitypub' ) ),
+				\esc_html( $comment_type['singular'] ),
+				\esc_html( $post->post_title )
+			) . PHP_EOL . PHP_EOL;
+
+		} else {
+			$parent_comment = \get_comment( $comment->comment_parent );
+			$notify_message = \sprintf(
+				/* translators: 1: Comment type, 2: Post title, 3: Parent comment author */
+				\html_entity_decode( esc_html__( 'New %1$s on your post “%2$s” in reply to %3$s’s comment.', 'activitypub' ) ),
+				\esc_html( $comment_type['singular'] ),
+				\esc_html( $post->post_title ),
+				\esc_html( $parent_comment->comment_author )
+			) . PHP_EOL . PHP_EOL;
+		}
+
 		/* translators: 1: Website name, 2: Website IP address, 3: Website hostname. */
 		$notify_message .= \sprintf( \esc_html__( 'From: %1$s (IP address: %2$s, %3$s)', 'activitypub' ), \esc_html( $comment->comment_author ), \esc_html( $comment->comment_author_IP ), \esc_html( $comment_author_domain ) ) . "\r\n";
 		/* translators: Reaction author URL. */

includes/collection/class-interactions.php

@@ -89,15 +89,9 @@ public static function update_comment( $activity ) {
 	 *
 	 * @param array $activity Activity array.
 	 *
-	 * @return array|false      Comment data or `false` on failure.
+	 * @return array|false Comment data or `false` on failure.
 	 */
 	public static function add_reaction( $activity ) {
-		$comment_data = self::activity_to_comment( $activity );
-
-		if ( ! $comment_data ) {
-			return false;
-		}
-
 		$url               = object_to_uri( $activity['object'] );
 		$comment_post_id   = \url_to_postid( $url );
 		$parent_comment_id = url_to_commentid( $url );
@@ -113,16 +107,19 @@ public static function add_reaction( $activity ) {
 		}
 
 		$comment_type = Comment::get_comment_type_by_activity_type( $activity['type'] );
-
 		if ( ! $comment_type ) {
 			// Not a valid comment type.
 			return false;
 		}
 
-		$comment_content = $comment_type['excerpt'];
+		$comment_data = self::activity_to_comment( $activity );
+		if ( ! $comment_data ) {
+			return false;
+		}
 
 		$comment_data['comment_post_ID']           = $comment_post_id;
-		$comment_data['comment_content']           = \esc_html( $comment_content );
+		$comment_data['comment_parent']            = $parent_comment_id ? $parent_comment_id : 0;
+		$comment_data['comment_content']           = \esc_html( $comment_type['excerpt'] );
 		$comment_data['comment_type']              = \esc_attr( $comment_type['type'] );
 		$comment_data['comment_meta']['source_id'] = \esc_url_raw( $activity['id'] );
 

includes/rest/class-post-controller.php

@@ -98,6 +98,7 @@ public function get_reactions( $request ) {
 					'post_id' => $post_id,
 					'type'    => $type_object['type'],
 					'status'  => 'approve',
+					'parent'  => 0,
 				)
 			);
 

src/reactions/render.php

@@ -33,6 +33,7 @@
 			'post_id' => $_post_id,
 			'type'    => $_type,
 			'status'  => 'approve',
+			'parent'  => 0,
 		)
 	);
 

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

@@ -8,14 +8,13 @@
 namespace Activitypub\Tests\Collection;
 
 use Activitypub\Collection\Interactions;
-use WP_UnitTestCase;
 
 /**
  * Test class for Activitypub Interactions.
  *
  * @coversDefaultClass \Activitypub\Collection\Interactions
  */
-class Test_Interactions extends WP_UnitTestCase {
+class Test_Interactions extends \WP_UnitTestCase {
 
 	/**
 	 * User ID.
@@ -489,6 +488,8 @@ public function test_no_likes_reposts_when_disabled() {
 
 		$result = Interactions::add_reaction( $activity );
 		$this->assertFalse( $result, 'Likes and reposts should not be collected when disabled.' );
+
+		\delete_option( 'activitypub_allow_likes' );
 	}
 
 	/**
@@ -508,6 +509,8 @@ public function test_no_reposts_when_disabled() {
 
 		$result = Interactions::add_reaction( $activity );
 		$this->assertFalse( $result, 'Reposts should not be collected when disabled.' );
+
+		\delete_option( 'activitypub_allow_reposts' );
 	}
 
 	/**

tests/includes/rest/class-test-post-controller.php

@@ -191,4 +191,39 @@ public function test_get_reactions_respects_approval() {
 		$this->assertEquals( 200, $response->get_status() );
 		$this->assertEmpty( $response->get_data() );
 	}
+
+	/**
+	 * Test getting reactions respects comment approval status.
+	 *
+	 * @covers ::get_reactions
+	 */
+	public function test_get_reactions_skips_comment_reactions() {
+		$post_id    = self::factory()->post->create();
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID' => $post_id,
+				'comment_type'    => 'comment',
+				'comment_content' => 'Test Comment',
+			)
+		);
+		self::factory()->comment->create(
+			array(
+				'comment_post_ID'      => $post_id,
+				'comment_author'       => 'Test User',
+				'comment_author_url'   => 'https://example.com/user',
+				'comment_author_email' => '',
+				'comment_content'      => '',
+				'comment_type'         => 'like',
+				'comment_parent'       => $comment_id,
+				'user_id'              => 0,
+				'comment_approved'     => 1,
+			)
+		);
+
+		$request  = new WP_REST_Request( 'GET', '/' . ACTIVITYPUB_REST_NAMESPACE . '/posts/' . $post_id . '/reactions' );
+		$response = $this->server->dispatch( $request );
+
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEmpty( $response->get_data() );
+	}
 }