Changeset 10860

Timestamp:

06/01/2016 09:23:09 PM (8 years ago)

Author:

r-a-y

Message:

Activity: Set WP error if activity content hits a moderation filter.

One important change we are making here is if the activity content matches
a word from the "Comment Blacklist" discussion option from WordPress, we
now stop recording the activity item.

Previously, we were still recording the activity item, but marking it as
spam.

See #6719.

Location:

trunk/src/bp-activity

Files:

• bp-activity-filters.php (modified) (2 diffs)
• bp-activity-functions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-filters.php

@@ -156 +156 @@
 
     // Only check specific types of activity updates.
-    if ( !in_array( $activity->type, bp_activity_get_moderated_activity_types() ) )
+    if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) ) {
         return;
-
-    // Unset the activity component so activity stream update fails
+    }
+
+    // Send back the error so activity update fails.
     // @todo This is temporary until some kind of moderation is built.
-    if ( !bp_core_check_for_moderation( $activity->user_id, '', $activity->content ) )
+    $moderate = bp_core_check_for_moderation( $activity->user_id, '', $activity->content, 'wp_error' );
+    if ( is_wp_error( $moderate ) ) {
+        $activity->errors = $moderate;
+
+        // Backpat.
         $activity->component = false;
+    }
 }
 
@@ -175 +181 @@
 
     // Only check specific types of activity updates.
-    if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) )
+    if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) ) {
         return;
-
-    // Mark as spam.
-    if ( ! bp_core_check_for_blacklist( $activity->user_id, '', $activity->content ) )
-        bp_activity_mark_as_spam( $activity, 'by_blacklist' );
+    }
+
+    // Send back the error so activity update fails.
+    // @todo This is temporary until some kind of trash status is built.
+    $blacklist = bp_core_check_for_blacklist( $activity->user_id, '', $activity->content, 'wp_error' );
+    if ( is_wp_error( $blacklist ) ) {
+        $activity->errors = $blacklist;
+
+        // Backpat.
+        $activity->component = false;
+    }
 }
 

trunk/src/bp-activity/bp-activity-functions.php

@@ -3326 +3326 @@
  * @since 1.6.0
  *
+ * @todo We should probably save $source to activity meta.
+ *
  * @param BP_Activity_Activity $activity The activity item to be spammed.
  * @param string               $source   Optional. Default is "by_a_person" (ie, a person has