Fix: duplicate content check (#1304)

* Fix: Duplicate comment check

If a comment is sent twice and (because of a race condition) both will be stored in the db, this false check will allow that all new comments will be added as separate comments instead of extending the first one!

* get lastest comment first

* Add changelog

* Fix Test

* Add unittests

* more descriptive changelogs

Author: pfefferle

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 * Enforce 200 status header for valid ActivityPub requests.
+* `object_id_to_comment` returns a commment now, even if there are more than one matching comment in the DB.
 * Integration of content-visibility setup in the block editor.
 * Update CLI commands to the new scheduler refactorings.
 * Do not add an audience to the Actor-Profiles.

includes/class-comment.php

@@ -264,17 +264,15 @@ public static function object_id_to_comment( $id ) {
 			array(
 				'meta_key'   => 'source_id', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
 				'meta_value' => $id,         // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value
+				'orderby'    => 'comment_date',
+				'order'      => 'DESC',
 			)
 		);
 
 		if ( ! $comment_query->comments ) {
 			return false;
 		}
 
-		if ( count( $comment_query->comments ) > 1 ) {
-			return false;
-		}
-
 		return $comment_query->comments[0];
 	}
 

readme.txt

@@ -139,6 +139,7 @@ For reasons of data protection, it is not possible to see the followers of other
 * Changed: Enabled querying of Outbox posts through the REST API to improve troubleshooting and debugging.
 * Changed: Updated terminology to be client-neutral in the Federated Reply block.
 * Fixed: Enforce 200 status header for valid ActivityPub requests.
+* Fixed: `object_id_to_comment` returns a commment now, even if there are more than one matching comment in the DB.
 * Fixed: Integration of content-visibility setup in the block editor.
 * Fixed: Update CLI commands to the new scheduler refactorings.
 * Fixed: Do not add an audience to the Actor-Profiles.

tests/includes/class-test-comment.php

@@ -592,4 +592,54 @@ public function test_get_comment_type_names() {
 		$this->assertNotContains( 'Repost', $names );
 		$this->assertNotContains( 'Like', $names );
 	}
+
+	/**
+	 * Test object_id_to_comment method.
+	 *
+	 * @covers ::object_id_to_comment
+	 */
+	public function test_object_id_to_comment() {
+		$source_id = 'https://example.com/1';
+
+		// No comment with the same source_id.
+		$comment_0 = Comment::object_id_to_comment( $source_id );
+		$this->assertFalse( $comment_0 );
+
+		// Create a comment with the same source_id.
+		$id_1 = self::factory()->comment->create();
+		add_comment_meta( $id_1, 'source_id', $source_id, true );
+
+		// Get the comment with the same source_id.
+		$comment_1 = Comment::object_id_to_comment( $source_id );
+		$this->assertEquals( $id_1, $comment_1->comment_ID );
+
+		// Create another comment with the same source_id.
+		$id_2 = self::factory()->comment->create(
+			array(
+				'comment_date' => '2024-01-01 00:00:00',
+			)
+		);
+		add_comment_meta( $id_2, 'source_id', $source_id, true );
+
+		// Get the comment with the same source_id.
+		$comment_2 = Comment::object_id_to_comment( $source_id );
+		$this->assertEquals( $id_1, $comment_2->comment_ID );
+
+		// Create another comment with the same source_id.
+		$id_3 = self::factory()->comment->create(
+			array(
+				'comment_date' => '2024-01-01 00:00:00',
+			)
+		);
+		add_comment_meta( $id_3, 'source_id', $source_id, true );
+
+		// Get the comment with the same source_id.
+		$comment_3 = Comment::object_id_to_comment( $source_id );
+		$this->assertEquals( $id_1, $comment_3->comment_ID );
+
+		// Delete the comments.
+		wp_delete_comment( $id_1, true );
+		wp_delete_comment( $id_2, true );
+		wp_delete_comment( $id_3, true );
+	}
 }

tests/includes/class-test-functions.php

@@ -122,7 +122,7 @@ public function test_object_id_to_comment_duplicate() {
 		remove_filter( 'wp_is_comment_flood', '__return_false', 99 );
 
 		$query_result = \Activitypub\object_id_to_comment( $duplicate_comment_source_id );
-		$this->assertFalse( $query_result );
+		$this->assertInstanceOf( \WP_Comment::class, $query_result );
 	}
 
 	/**