Changeset 3111969

Timestamp:

07/03/2024 10:24:56 PM (21 months ago)

Author:

kbrownkd

Message:

Skip the comment check when the comment matches the disallowed list.

Location:

akismet/trunk

Files:

• akismet.php (modified) (2 diffs)
• class.akismet-admin.php (modified) (2 diffs)
• class.akismet.php (modified) (4 diffs)
• readme.txt (modified) (1 diff)

akismet/trunk/akismet.php

@@ -7 +7 @@
 Plugin URI: https://akismet.com/
 Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam</strong>. Akismet Anti-spam keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key.
-Version: 5.3.3a8
+Version: 5.3.3a9
 Requires at least: 5.8
 Requires PHP: 5.6.20
@@ -40 +40 @@
 }
 
-define( 'AKISMET_VERSION', '5.3.3a8' );
+define( 'AKISMET_VERSION', '5.3.3a9' );
 define( 'AKISMET__MINIMUM_WP_VERSION', '5.8' );
 define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

akismet/trunk/class.akismet-admin.php

@@ -534 +534 @@
 
     public static function comment_row_action( $a, $comment ) {
-        $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
+        $akismet_result  = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
+        if ( ! $akismet_result && get_comment_meta( $comment->comment_ID, 'akismet_skipped', true ) ) {
+            $akismet_result = 'skipped'; // Akismet chose to skip the comment-check request.
+        }
+
         $akismet_error  = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
-        $user_result    = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+        $user_result    = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true );
         $comment_status = wp_get_comment_status( $comment->comment_ID );
         $desc = null;
@@ -679 +683 @@
                         case 'webhook-ham-noaction':
                             $message = esc_html( __( 'Akismet cleared this comment during a recheck. It did not update the comment status because it had already been modified by another user or plugin.', 'akismet' ) );
+                            break;
+                        case 'akismet-skipped':
+                            $message = esc_html( __( 'This comment was not sent to Akismet when it was submitted because it was caught by something else.', 'akismet' ) );
+                            break;
+                        case 'akismet-skipped-disallowed':
+                            $message = esc_html( __( 'This comment was not sent to Akismet when it was submitted because it was caught by the comment disallowed list.', 'akismet' ) );
                             break;
                         default:

akismet/trunk/class.akismet.php

@@ -225 +225 @@
         self::$last_comment_result = null;
 
+        // Skip the Akismet check if the comment matches the Disallowed Keys list.
+        if ( function_exists( 'wp_check_comment_disallowed_list' ) ) {
+            $comment_author       = isset( $commentdata['comment_author'] ) ? $commentdata['comment_author'] : '';
+            $comment_author_email = isset( $commentdata['comment_author_email'] ) ? $commentdata['comment_author_email'] : '';
+            $comment_author_url   = isset( $commentdata['comment_author_url'] ) ? $commentdata['comment_author_url'] : '';
+            $comment_content      = isset( $commentdata['comment_content'] ) ? $commentdata['comment_content'] : '';
+            $comment_author_ip    = isset( $commentdata['comment_author_IP'] ) ? $commentdata['comment_author_IP'] : '';
+            $comment_agent        = isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '';
+
+            if ( wp_check_comment_disallowed_list( $comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_ip, $comment_agent ) ) {
+                self::set_last_comment( $commentdata );
+                return $commentdata;
+            }
+        }
+
         $comment = $commentdata;
 
@@ -428 +443 @@
 
                 // normal result: true or false
-                if ( self::$last_comment['akismet_result'] == 'true' ) {
+                if ( isset( self::$last_comment['akismet_result'] ) && self::$last_comment['akismet_result'] == 'true' ) {
                     update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
                     self::update_comment_history( $comment->comment_ID, '', 'check-spam' );
@@ -438 +453 @@
                         );
                     }
-                } elseif ( self::$last_comment['akismet_result'] == 'false' ) {
+                } elseif ( isset( self::$last_comment['akismet_result'] ) && self::$last_comment['akismet_result'] == 'false' ) {
                     update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
                     self::update_comment_history( $comment->comment_ID, '', 'check-ham' );
@@ -450 +465 @@
                                 self::update_comment_history( $comment->comment_ID, '', 'status-changed-' . $comment->comment_approved );
                             }
-                        } else if ( function_exists( 'wp_blacklist_check' ) && wp_blacklist_check( $comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent ) ) {
-                            self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' );
                         } else {
                             self::update_comment_history( $comment->comment_ID, '', 'status-changed-' . $comment->comment_approved );
                         }
+                    }
+                } elseif ( ! isset( self::$last_comment['akismet_result'] ) ) {
+                    // akismet_result isn't set, so the comment wasn't sent to Akismet.
+                    update_comment_meta( $comment->comment_ID, 'akismet_skipped', 'true' );
+                    $caught_by_disallowed_list = false;
+
+                    if ( function_exists( 'wp_check_comment_disallowed_list' ) ) {
+                        $caught_by_disallowed_list = wp_check_comment_disallowed_list( $comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent );
+                    }
+
+                    if ( $caught_by_disallowed_list ) {
+                        self::update_comment_history( $comment->comment_ID, '', 'wp-disallowed' );
+                        self::update_comment_history( $comment->comment_ID, '', 'akismet-skipped-disallowed' );
+                    } else {
+                        // Add a generic skipped history item.
+                        self::update_comment_history( $comment->comment_ID, '', 'akismet-skipped' );
                     }
                 } else {

akismet/trunk/readme.txt

@@ -37 +37 @@
 * Make setup step clearer for new users.
 * Remove the stats section from the configuration page if the site has been revoked from the key.
+* Skip the Akismet comment check when the comment matches something in the disallowed list.
 
 = 5.3.2 =