♻️ Refactoring(chat): move filter to admin file

and rename pages to avoid potential conflicts

Author: MasterKenth

library/AcfFields/json/options-chat.json

@@ -327,7 +327,7 @@
                 {
                     "key": "field_6a21301b299ff",
                     "label": "Pages",
-                    "name": "pages",
+                    "name": "chat_assistant_pages",
                     "aria-label": "",
                     "type": "post_object",
                     "instructions": "Pages to use this assistant on for the chat bubble.",

library/AcfFields/php/options-chat.php

@@ -330,7 +330,7 @@
                 2 => array(
                     'key' => 'field_6a21301b299ff',
                     'label' => __('Pages', 'municipio'),
-                    'name' => 'pages',
+                    'name' => 'chat_assistant_pages',
                     'aria-label' => '',
                     'type' => 'post_object',
                     'instructions' => __('Pages to use this assistant on for the chat bubble.', 'municipio'),

library/Chat/Admin/ChatAdminPage.php

@@ -6,17 +6,22 @@
 use Municipio\HooksRegistrar\Hookable;
 use WpService\Contracts\__;
 use WpService\Contracts\AddAction;
+use WpService\Contracts\AddFilter;
+use WpService\Contracts\GetPostTypeObject;
+use WpService\Contracts\IsPostTypeHierarchical;
+use WpService\Contracts\IsPostTypeViewable;
 
 class ChatAdminPage implements Hookable
 {
     public function __construct(
-        private __&AddAction $wpService,
+        private __&AddAction&AddFilter&GetPostTypeObject&IsPostTypeHierarchical&IsPostTypeViewable $wpService,
         private AddOptionsPage $acfService,
     ) {}
 
     public function addHooks(): void
     {
         $this->wpService->addAction('init', [$this, 'register']);
+        $this->wpService->addFilter('acf/fields/post_object/query/name=chat_assistant_pages', [$this, 'filterAssistantPagesField'], 10, 1);
     }
 
     public function register(): void
@@ -32,4 +37,15 @@ public function register(): void
             'icon_url' => 'dashicons-format-chat',
         ]);
     }
+
+    public function filterAssistantPagesField(array $args): array
+    {
+        $wpService = $this->wpService;
+        $args['post_type'] = array_filter($args['post_type'] ?? [], static function ($postType) use ($wpService) {
+            $postObj = $wpService->getPostTypeObject($postType);
+            return $postObj && $wpService->isPostTypeHierarchical($postType) && $wpService->isPostTypeViewable($postObj);
+        });
+
+        return $args;
+    }
 }

library/Chat/ChatFeature.php

@@ -35,8 +35,6 @@ public function enable(): void
 
         (new ChatAdminPage($this->wpService, $this->acfService))->addHooks();
 
-        $this->wpService->addFilter('acf/fields/post_object/query/name=pages', [$this, 'filterPostObjectField'], 10, 3);
-
         if (!$config->isEnabled()) {
             return;
         }
@@ -56,15 +54,4 @@ public function enable(): void
 
         (new ChatStatsMetaBox($this->wpService, $bladeRenderer))->addHooks();
     }
-
-    public function filterPostObjectField($args, $field, $postId)
-    {
-        $wpService = $this->wpService;
-        $args['post_type'] = array_filter($args['post_type'] ?? [], static function ($postType) use ($wpService) {
-            $postObj = $wpService->getPostTypeObject($postType);
-            return $postObj && $wpService->isPostTypeHierarchical($postType) && $wpService->isPostTypeViewable($postObj);
-        });
-
-        return $args;
-    }
 }

library/Chat/ChatFeatureTest.php

@@ -27,6 +27,7 @@ public function testClassCanBeInstantiated(): void
     public function testEnableCanBeCalled(): void
     {
         $wpService = new FakeWpService([
+            'addFilter' => true,
             'addAction' => true,
         ]);
         $acfService = new FakeAcfService([

library/Chat/Config/ChatConfig.php

@@ -49,11 +49,11 @@ public function getAssistantForActiveQuery(): ?array
 
         foreach ($postChain as $queriedPostId) {
             foreach ($assistants as $assistant) {
-                if (empty($assistant['pages']) || !is_array($assistant['pages'])) {
+                if (empty($assistant['chat_assistant_pages']) || !is_array($assistant['chat_assistant_pages'])) {
                     continue;
                 }
 
-                if (in_array($queriedPostId, $assistant['pages'], true)) {
+                if (in_array($queriedPostId, $assistant['chat_assistant_pages'], true)) {
                     return $assistant;
                 }
             }

library/Chat/Config/ChatConfigTest.php

@@ -119,8 +119,8 @@ public function testGetAssistantForActiveQueryReturnsDefaultWhenNoAssistantMatch
     public function testGetAssistantForActiveQueryReturnsMatchingAssistant(): void
     {
         $assistants = [
-            ['name' => 'Ava', 'pages' => [123]],
-            ['name' => 'Noah', 'pages' => [456]],
+            ['name' => 'Ava', 'chat_assistant_pages' => [123]],
+            ['name' => 'Noah', 'chat_assistant_pages' => [456]],
         ];
 
         $config = new ChatConfig(
@@ -135,8 +135,8 @@ public function testGetAssistantForActiveQueryReturnsMatchingAssistant(): void
     public function testGetAssistantForActiveQueryReturnsInheritedAssistant(): void
     {
         $assistants = [
-            ['name' => 'Ava', 'pages' => [123]],
-            ['name' => 'Noah', 'pages' => [456]],
+            ['name' => 'Ava', 'chat_assistant_pages' => [123]],
+            ['name' => 'Noah', 'chat_assistant_pages' => [456]],
         ];
 
         $config = new ChatConfig(
@@ -151,8 +151,8 @@ public function testGetAssistantForActiveQueryReturnsInheritedAssistant(): void
     public function testGetAssistantForActiveQueryReturnsMostSpecificMatch(): void
     {
         $assistants = [
-            ['name' => 'Ava', 'pages' => [123, 789]],
-            ['name' => 'Noah', 'pages' => [456, 789]],
+            ['name' => 'Ava', 'chat_assistant_pages' => [123, 789]],
+            ['name' => 'Noah', 'chat_assistant_pages' => [456, 789]],
         ];
 
         $config = new ChatConfig(