Changeset 7356

Timestamp:

11/14/2025 11:30:00 PM (4 weeks ago)

Author:

johnjamesjacoby

Message:

Akismet: improve verbiage in history log items.

When Akismet catches spam for moderators, and moderators are able to bypass spam, a second log entry is inserted into the history to explain why, and the previous verbiage was not very clear.

This commit attempts to provide some clarity, while also respecting that this specific code is filterable, and that the spam recommendation could be overruled by third-party plugins for any reason.

This commit also adds some hooks by request, and improves some related code docs.

Props johnjamesjacoby, r-a-y, sirlouen.

In trunk, for 2.7.

See r7353. Fixes #3434.

File:

• trunk/src/includes/extend/akismet.php (modified) (9 diffs)

trunk/src/includes/extend/akismet.php

@@ -248 +248 @@
         if ( 'true' === $post_data['bbp_akismet_result'] ) {
 
-            // Let plugins do their thing
-            do_action( 'bbp_akismet_spam_caught' );
+            /**
+             * Hook that fires after Akismet has caught a post as spammy and
+             * immediately before its status is set to spam.
+             *
+             * @since 2.0.0 bbPress (r3308)
+             *
+             * @param array $post_data Post data.
+             */
+            do_action( 'bbp_akismet_spam_caught', $post_data );
 
             // Set post_status to spam
@@ -559 +566 @@
         if ( is_object( $_post ) && ! empty( $this->last_post ) && is_array( $as_submitted ) ) {
 
+            /**
+             * Fires immediately before post meta is updated on a bbPress post
+             * that Akismet has checked.
+             *
+             * @since 2.7.0 bbPress (r7355)
+             *
+             * @param int $post_id
+             * @param object $_post
+             */
+            do_action( 'bbp_akismet_before_update_post_meta', $post_id, $_post );
+
             // Get user data
             $userdata       = get_userdata( $_post->post_author );
@@ -602 +620 @@
                     $this->update_post_history(
                         $post_id,
-                        esc_html__( 'Akismet caught this post as spam', 'bbpress' ),
+                        esc_html__( 'Akismet caught this post as spam.', 'bbpress' ),
                         'check-spam'
                     );
@@ -611 +629 @@
                             $post_id,
                             sprintf(
-                                esc_html__( 'Post status was changed to %s', 'bbpress' ),
+                                esc_html__( 'Akismet overruled. Post status overridden to %s.', 'bbpress' ),
                                 $_post->post_status
                             ),
@@ -625 +643 @@
                     $this->update_post_history(
                         $post_id,
-                        esc_html__( 'Akismet cleared this post as not spam', 'bbpress' ),
+                        esc_html__( 'Akismet cleared this post as not spam.', 'bbpress' ),
                         'check-ham'
                     );
@@ -634 +652 @@
                             $post_id,
                             sprintf(
-                                esc_html__( 'Post status was changed to %s', 'bbpress' ),
+                                esc_html__( 'Akismet overruled. Post status overridden to %s.', 'bbpress' ),
                                 $_post->post_status
                             ),
@@ -664 +682 @@
                 }
             }
+
+            /**
+             * Fires immediately after post meta is updated on a bbPress post
+             * that Akismet has checked.
+             *
+             * @since 2.7.0 bbPress (r7355)
+             *
+             * @param int $post_id
+             * @param object $_post
+             */
+            do_action( 'bbp_akismet_after_update_post_meta', $post_id, $_post );
         }
     }
@@ -671 +700 @@
      *
      * @since 2.0.0 bbPress (r3308)
+     * @since 2.7.0 bbPress (r7355) Changed from private to public.
      *
      * @param int $post_id
@@ -676 +706 @@
      * @param string $event
      */
-    private function update_post_history( $post_id = 0, $message = null, $event = null ) {
+    public function update_post_history( $post_id = 0, $message = null, $event = null ) {
 
         // Define local variable(s)