Changeset 11890 for trunk/src/bp-activity/classes/class-bp-akismet.php

Timestamp:

03/05/2018 04:54:39 PM (9 years ago)

Author:

djpaul

Message:

Activity, Akismet: add support for Akismet's "discard worse spam" feature.

Fixes #6594

Thanks to slaFFik, and via bbPress, netweb and Otto42, for historical contributions towards this change.

File:

• trunk/src/bp-activity/classes/class-bp-akismet.php (modified) (2 diffs)

trunk/src/bp-activity/classes/class-bp-akismet.php

@@ -412 +412 @@
                         // Mark as spam.
                         bp_activity_mark_as_spam( $activity, 'by_akismet' );
+
+                        if (
+                                Akismet::allow_discard() &&
+                                ! empty( $activity_data['bp_as_result_headers']['X-akismet-pro-tip'] ) &&
+                                $activity_data['bp_as_result_headers']['X-akismet-pro-tip'] === 'discard'
+                        ) {
+                                // If this is so spammy it's not worth your time, let's just delete it.
+                                if ( $activity->type === 'activity_comment' ) {
+                                        bp_activity_delete_comment( $activity->item_id, $activity->id );
+                                } else {
+                                        bp_activity_delete( array( 'id' => $activity->id ) );
+                                }
+                        }
                 }
 
@@ -547 +560 @@
                 remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
 
+                $activity_data['bp_as_result_headers'] = array();
+                $activity_data['bp_as_result']         = '';
+
                 // Get the response.
-                if ( ! empty( $response[1] ) && ! is_wp_error( $response[1] ) )
-                        $activity_data['bp_as_result'] = $response[1];
-                else
-                        $activity_data['bp_as_result'] = false;
+                if ( ! empty( $response[1] ) && ! is_wp_error( $response[1] ) ) {
+                        $activity_data['bp_as_result_headers'] = $response[0];
+                        $activity_data['bp_as_result']         = $response[1];
+                }
 
                 // Perform a daily tidy up.