Changeset 5259 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

10/24/2011 02:00:04 PM (14 years ago)

Author:

djpaul

Message:

First pass of Akismet support for the Activity component. See #3660

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (12 diffs)

trunk/bp-activity/bp-activity-classes.php

@@ -1 +1 @@
 <?php
-
 /**
  * BuddyPress Activity Classes
  *
  * @package BuddyPress
- * @subpackage ActivityClasses
+ * @subpackage Activity
  */
 
@@ -25 +24 @@
     var $mptt_left;
     var $mptt_right;
-
-    function bp_activity_activity( $id = false ) {
-        $this->__construct( $id );
-    }
+    var $is_spam;
 
     function __construct( $id = false ) {
-        global $bp;
-
         if ( !empty( $id ) ) {
             $this->id = $id;
@@ -56 +50 @@
             $this->mptt_left         = $row->mptt_left;
             $this->mptt_right        = $row->mptt_right;
+            $this->is_spam           = $row->is_spam;
         }
     }
@@ -75 +70 @@
         $this->mptt_left         = apply_filters_ref_array( 'bp_activity_mptt_left_before_save',         array( $this->mptt_left,         &$this ) );
         $this->mptt_right        = apply_filters_ref_array( 'bp_activity_mptt_right_before_save',        array( $this->mptt_right,        &$this ) );
+        $this->is_spam           = apply_filters_ref_array( 'bp_activity_is_spam_before_save',           array( $this->is_spam,           &$this ) );
 
         // Use this, not the filters above
@@ -87 +83 @@
         // If we have an existing ID, update the activity item, otherwise insert it.
         if ( $this->id )
-            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
-        else
-            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %s, %s, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
+            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %s, secondary_item_id = %s, hide_sitewide = %d, is_spam = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam, $this->id );
+        else
+            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide, is_spam ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam );
 
         if ( !$wpdb->query( $q ) )
@@ -103 +99 @@
 
     // Static Functions
-
-    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false ) {
+    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false, $in = false, $hide_spam = true ) {
         global $wpdb, $bp;
 
@@ -114 +109 @@
         // Where conditions
         $where_conditions = array();
+
+        // Spam
+        if ( $hide_spam )
+            $where_conditions['spam_sql'] = 'a.is_spam = 0';
 
         // Searching
@@ -192 +191 @@
 
         if ( $activities && $display_comments )
-            $activities = BP_Activity_Activity::append_comments( $activities );
+            $activities = BP_Activity_Activity::append_comments( $activities, $hide_spam );
 
         // If $max is set, only return up to the max results
@@ -357 +356 @@
     }
 
-    function append_comments( $activities ) {
+    /**
+     * Append activity comments to their associated activity items
+     *
+     * @global object $bp Global BuddyPress settings object
+     * @global wpdb $wpdb WordPress database object
+     * @param array $activities
+     * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+     * @return array The updated activities with nested comments
+     * @since 1.2
+     */
+    function append_comments( $activities, $hide_spam = true ) {
         global $bp, $wpdb;
 
@@ -365 +374 @@
         foreach( (array)$activities as $activity ) {
             if ( 'activity_comment' != $activity->type && $activity->mptt_left && $activity->mptt_right )
-                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right );
+                $activity_comments[$activity->id] = BP_Activity_Activity::get_activity_comments( $activity->id, $activity->mptt_left, $activity->mptt_right, $hide_spam );
         }
 
@@ -376 +385 @@
     }
 
-    function get_activity_comments( $activity_id, $left, $right ) {
+    /**
+     * Get activity comments that are associated with a specific activity ID
+     *
+     * @global object $bp Global BuddyPress settings object
+     * @global wpdb $wpdb WordPress database object
+     * @param int $activity_id Activity ID to fetch comments for
+     * @param int $left Left-most node boundary
+     * @param into $right Right-most node boundary
+     * @param bool $hide_spam Optional. Defaults to true (don't retrieve spammed items).
+     * @return array The updated activities with nested comments
+     * @since 1.2
+     */
+    function get_activity_comments( $activity_id, $left, $right, $hide_spam = true ) {
         global $wpdb, $bp;
 
@@ -391 +412 @@
             }
 
+            // Don't retrieve activity comments marked as spam
+            if ( $hide_spam )
+                $spam_sql = 'AND a.is_spam = 0';
+            else
+                $spam_sql = '';
+
+            $sql = apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' ${spam_sql} AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right, $hide_spam );
+
             // Retrieve all descendants of the $root node
-            $descendants = $wpdb->get_results( apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right ) );
+            $descendants = $wpdb->get_results( $sql );
 
             // Loop descendants and build an assoc array