Changeset 10964

Timestamp:

05/11/2021 05:19:18 AM (5 years ago)

Author:

dd32

Message:

Registration: Remove Akismet from the flow, rely upon the heuristics instead.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• admin/class-user-registrations-list-table.php (modified) (3 diffs)
• functions-registration.php (modified) (3 diffs)
• pending-create.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -24 +24 @@
             ],
             [
-                'akismet',
-                'Akismet said no',
-            ],
-            [
-                'heuristics',
-                'Heiristics: Review / Block',
+                'heuristics-review',
+                'Heuristics: Review',
+            ],
+            [
+                'heuristics-block',
+                'Heuristics: Block',
             ]
         ];
@@ -84 +84 @@
             case 'akismet':
                 return "meta LIKE '%akismet_result\":\"spam%'";
-            case 'heuristics':
-                return "meta LIKE '%heuristics%' AND meta NOT LIKE '%heuristics\":\"allow%'";
+            case 'heuristics-allow':
+                return "meta LIKE '%heuristics\":\"allow%'";
+            case 'heuristics-review':
+                return "meta LIKE '%heuristics\":\"review%'";
+            case 'heuristics-block':
+                return "meta LIKE '%heuristics\":\"block%'";
             case 'registered':
                 return 'created = 1';
@@ -271 +275 @@
 
     }
-
 
     function column_meta( $item ) {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -42 +42 @@
 
     return (bool) $result['success'];
-}
-
-/**
- * Check the user registration attempt against Akismet.
- */
-function wporg_login_check_akismet( $user_login, $user_email, $user_url = '', $content = array() ) {
-    if ( ! class_exists( 'Akismet' ) ) {
-        return 'OK';
-    }
-
-    $payload = [
-        'type'                 => 'user_signup',
-        'comment_author'       => $user_login,
-        'comment_author_email' => $user_email,
-        'comment_author_url'   => $user_url,
-        'comment_content'      => implode( "\n", $content ),
-        'comment_post_ID'      => 0,
-    ];
-
-    $akismet = Akismet::rest_auto_check_comment( $payload );
-    if ( is_wp_error( $akismet ) ) {
-        return $akismet->get_error_code();
-    }
-
-    if ( ! empty( $akismet['akismet_pro_tip'] ) && 'discard' === $akismet['akismet_pro_tip'] ) {
-        return 'spam';
-    } elseif ( 'true' === $akismet['akismet_result'] ) {
-        return 'spam';
-    } elseif ( 'false' === $akismet['akismet_result'] ) {
-        return 'OK';
-    } else {
-        return 'unknown';
-    }
 }
 
@@ -122 +89 @@
     }
 
+    $pending_user['meta']['heuristics'] = 'allow';
     if ( function_exists( 'wporg_registration_check_private_heuristics' ) ) {
         // Returns block, review, allow.
@@ -127 +95 @@
     }
 
-    $pending_user['meta']['akismet_result'] = wporg_login_check_akismet( $user_login, $user_email );
-
     $pending_user['cleared'] = (
-        // ( !isset( $pending_user['meta']['heuristics'] ) || 'allow' === $pending_user['meta']['heuristics'] ) && // Disabled for now, review results first, replace Akismet below
-        'spam' !== $pending_user['meta']['akismet_result'] &&
+        'allow' === $pending_user['meta']['heuristics'] &&
         (float)$pending_user['scores']['pending'] >= (float) get_option( 'recaptcha_v3_threshold', 0.2 ) 
     );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php

@@ -82 +82 @@
             $pending_user['cleared'] = 0;
         }
-    }
-
-    // Check Akismet with new profile information
-    $pending_user['meta']['akismet_result'] = wporg_login_check_akismet(
-        $pending_user['user_login'],
-        $pending_user['user_email'],
-        $pending_user['meta']['url'] ?? '',
-        array_filter( [
-            $pending_user['meta']['from'] ?? '',
-            $pending_user['meta']['occ'] ?? '',
-            $pending_user['meta']['interests'] ?? '',
-        ] )
-    );
-
-    if ( 'spam' === $pending_user['meta']['akismet_result'] ) {
-        $pending_user['cleared'] = 0;
-        unset( $_POST['user_pass'] );
     }