Changeset 62193

Timestamp:

04/01/2026 03:53:17 PM (6 months ago)

Author:

jorgefilipecosta

Message:

Fix: Register Akismet Anti-Spam as a connector.

Akismet comes with core but the connectors screen was not showing akismet even if akismet was on the file system. This commit fixes the issue.

Props jorgefilipecosta, bluefuton, gziolo.
Fixes #65012.

Location:

trunk

Files:

• src/wp-includes/connectors.php (modified) (1 diff)
• tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api/rest-settings-controller.php (modified) (1 diff)
• tests/qunit/fixtures/wp-api-generated.js (modified) (2 diffs)

trunk/src/wp-includes/connectors.php

@@ -210 +210 @@
                 _wp_connectors_register_default_ai_providers( $registry );
         }
+
+        // Non-AI default connectors.
+        $registry->register(
+                'akismet',
+                array(
+                        'name'           => __( 'Akismet Anti-spam' ),
+                        'description'    => __( 'Protect your site from spam.' ),
+                        'type'           => 'spam_filtering',
+                        'plugin'         => array(
+                                'file' => 'akismet/akismet.php',
+                        ),
+                        'authentication' => array(
+                                'method'          => 'api_key',
+                                'credentials_url' => 'https://akismet.com/get/',
+                                'setting_name'    => 'wordpress_api_key',
+                                'constant_name'   => 'WPCOM_API_KEY',
+                        ),
+                )
+        );
 
         /**

trunk/tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php

@@ -38 +38 @@
                 $this->assertArrayHasKey( 'openai', $connectors );
                 $this->assertArrayHasKey( 'anthropic', $connectors );
+                $this->assertArrayHasKey( 'akismet', $connectors );
                 $this->assertArrayHasKey( 'mock-connectors-test', $connectors );
-                $this->assertCount( 4, $connectors );
+                $this->assertCount( 5, $connectors );
         }
 
@@ -57 +58 @@
                         $this->assertIsString( $connector_data['description'], "Connector '{$connector_id}' description should be a string." );
                         $this->assertArrayHasKey( 'type', $connector_data, "Connector '{$connector_id}' is missing 'type'." );
-                        $this->assertContains( $connector_data['type'], array( 'ai_provider' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
+                        $this->assertContains( $connector_data['type'], array( 'ai_provider', 'spam_filtering' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
                         $this->assertArrayHasKey( 'authentication', $connector_data, "Connector '{$connector_id}' is missing 'authentication'." );
                         $this->assertIsArray( $connector_data['authentication'], "Connector '{$connector_id}' authentication should be an array." );
@@ -80 +81 @@
 
                         $this->assertArrayHasKey( 'setting_name', $connector_data['authentication'], "Connector '{$connector_id}' authentication is missing 'setting_name'." );
-                        $this->assertSame(
-                                'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
-                                $connector_data['authentication']['setting_name'] ?? null,
-                                "Connector '{$connector_id}' setting_name does not match expected format."
-                        );
+
+                        // AI providers use the connectors_ai_{id}_api_key convention.
+                        // Non-AI connectors may use custom setting names.
+                        if ( 'ai_provider' === $connector_data['type'] ) {
+                                $this->assertSame(
+                                        'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
+                                        $connector_data['authentication']['setting_name'] ?? null,
+                                        "Connector '{$connector_id}' setting_name does not match expected format."
+                                );
+                        }
                 }
 

trunk/tests/phpunit/tests/rest-api/rest-settings-controller.php

@@ -120 +120 @@
                         'default_comment_status',
                         'site_icon', // Registered in wp-includes/blocks/site-logo.php
+                        'wordpress_api_key', // Registered by Akismet connector.
                         'wp_collaboration_enabled',
                 );

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -11012 +11012 @@
                     ],
                     "args": {
+                        "wordpress_api_key": {
+                            "title": "Akismet Anti-spam API Key",
+                            "description": "API key for the Akismet Anti-spam connector.",
+                            "type": "string",
+                            "required": false
+                        },
                         "title": {
                             "title": "Title",
@@ -14545 +14551 @@
 
 mockedApiResponse.settings = {
+    "wordpress_api_key": "",
     "title": "Test Blog",
     "description": "",