Merge pull request #416 from JLG-WOCFR-DEV/codex/refactor-sanitizementions-and-update-addcomment-bv6uaf

Refine comment mention sanitization

Author: JLG-WOCFR-DEV

supersede-css-jlg-enhanced/src/Infra/Comments/CommentStore.php

@@ -205,14 +205,27 @@ private function hydrateComment(array $raw, array $users): array
      */
     private function sanitizeMentions(array $mentions): array
     {
-        $uniqueIds = [];
+        $ids = [];
+
         foreach ($mentions as $mention) {
             $id = is_int($mention) ? $mention : (int) $mention;
-            if ($id <= 0) {
+            if ($id <= 0 || in_array($id, $ids, true)) {
                 continue;
             }
-            if (in_array($id, $uniqueIds, true)) {
-                continue;
+
+            $ids[] = $id;
+        }
+
+        if ($ids === []) {
+            return [];
+        }
+
+        $users = $this->loadUsers($ids);
+
+        $existing = [];
+        foreach ($ids as $id) {
+            if (isset($users[$id])) {
+                $existing[] = $id;
             }
             $uniqueIds[] = $id;
         }
@@ -226,10 +239,7 @@ private function sanitizeMentions(array $mentions): array
             return [];
         }
 
-        return array_values(array_filter(
-            $uniqueIds,
-            static fn(int $id): bool => isset($users[$id])
-        ));
+        return $existing;
     }
 
     /**

supersede-css-jlg-enhanced/tests/Infra/Comments/CommentStoreTest.php

@@ -79,66 +79,43 @@ public function test_get_comments_uses_single_query_for_shared_users(): void
         $this->assertSame($authorId, $second['mentions'][1]['id']);
     }
 
-    public function test_add_comment_filters_duplicate_and_invalid_mentions(): void
+    public function test_add_comment_sanitizes_mentions(): void
     {
         $authorId = self::factory()->user->create([
             'display_name' => 'Author',
         ]);
         $firstMentionId = self::factory()->user->create([
-            'display_name' => 'Bob',
+            'display_name' => 'First Mention',
         ]);
         $secondMentionId = self::factory()->user->create([
-            'display_name' => 'Carol',
+            'display_name' => 'Second Mention',
         ]);
 
         $result = $this->store->addComment(
             'post',
-            '42',
-            'Hello mentions',
+            '1',
+            'Hello world',
             [
                 $firstMentionId,
                 (string) $firstMentionId,
                 0,
                 -5,
-                'abc',
-                $secondMentionId,
-                99999,
+                'foo',
                 $secondMentionId,
+                999999,
             ],
             $authorId
         );
 
-        $stored = get_option('ssc_entity_comments');
-        $mentions = $stored['post']['42'][0]['mentions'] ?? null;
-
-        $this->assertSame([
-            $firstMentionId,
-            $secondMentionId,
-        ], $mentions);
-
         $this->assertCount(2, $result['mentions']);
         $this->assertSame($firstMentionId, $result['mentions'][0]['id']);
         $this->assertSame($secondMentionId, $result['mentions'][1]['id']);
-    }
-
-    public function test_add_comment_discards_nonexistent_mentions(): void
-    {
-        $authorId = self::factory()->user->create([
-            'display_name' => 'Author',
-        ]);
-
-        $result = $this->store->addComment(
-            'post',
-            '99',
-            'No valid mentions',
-            [123456, 0, 'foo'],
-            $authorId
-        );
 
         $stored = get_option('ssc_entity_comments');
-        $mentions = $stored['post']['99'][0]['mentions'] ?? null;
-
-        $this->assertSame([], $mentions);
-        $this->assertSame([], $result['mentions']);
+        $this->assertIsArray($stored);
+        $this->assertSame(
+            [$firstMentionId, $secondMentionId],
+            $stored['post']['1'][0]['mentions']
+        );
     }
 }