Changeset 2675

Timestamp:

02/11/2010 02:50:47 PM (15 years ago)

Author:

apeatling

Message:

Added missing pre_save filters to activity saving. Fixed bug where a user could leave/join a group quickly multiple times and flood the activity stream.

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-activity/bp-activity-filters.php (modified) (2 diffs)
• bp-groups.php (modified) (2 diffs)

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

@@ -47 +47 @@
         global $wpdb, $bp, $current_user;
 
-        do_action( 'bp_activity_before_save', $this );
+        do_action( 'bp_activity_before_save', &$this );
+
+        $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, &$this );
+        $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, &$this );
+        $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, &$this );
+        $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, &$this );
+        $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, &$this );
+        $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, &$this );
+        $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, &$this );
+        $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, &$this );
+        $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, &$this );
+        $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, &$this );
+        $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, &$this );
+        $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, &$this );
+        $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, &$this );
 
         if ( !$this->component || !$this->type )
@@ -67 +81 @@
             $this->id = $wpdb->insert_id;
 
-        do_action( 'bp_activity_after_save', $this );
+        do_action( 'bp_activity_after_save', &$this );
         return true;
     }
@@ -280 +294 @@
             return false;
 
+        error_log( $where_sql );
+
         /* Fetch the activity IDs so we can delete any comments for this activity item */
         $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );

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

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
+add_filter( 'bp_get_activity_action', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_content_body', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_activity_content_before_save', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_activity_action_before_save', 'bp_activity_filter_kses', 1 );
 
+add_filter( 'bp_get_activity_action', 'force_balance_tags' );
+add_filter( 'bp_get_activity_content_body', 'force_balance_tags' );
 add_filter( 'bp_get_activity_content', 'force_balance_tags' );
 add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
 add_filter( 'bp_get_activity_feed_item_description', 'force_balance_tags' );
 
+add_filter( 'bp_get_activity_action', 'wptexturize' );
+add_filter( 'bp_get_activity_content_body', 'wptexturize' );
 add_filter( 'bp_get_activity_content', 'wptexturize' );
 add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
 add_filter( 'bp_get_activity_latest_update', 'wptexturize' );
 
+add_filter( 'bp_get_activity_action', 'convert_smilies' );
+add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
 add_filter( 'bp_get_activity_content', 'convert_smilies' );
 add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
 add_filter( 'bp_get_activity_latest_update', 'convert_smilies' );
 
+add_filter( 'bp_get_activity_action', 'convert_chars' );
+add_filter( 'bp_get_activity_content_body', 'convert_chars' );
 add_filter( 'bp_get_activity_content', 'convert_chars' );
 add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
 add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
 
+add_filter( 'bp_get_activity_action', 'wpautop' );
+add_filter( 'bp_get_activity_content_body', 'wpautop' );
 add_filter( 'bp_get_activity_content', 'wpautop' );
 add_filter( 'bp_get_activity_feed_item_description', 'wpautop' );
 
+add_filter( 'bp_get_activity_action', 'make_clickable' );
+add_filter( 'bp_get_activity_content_body', 'make_clickable' );
 add_filter( 'bp_get_activity_content', 'make_clickable' );
 add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
@@ -31 +47 @@
 add_filter( 'bp_get_activity_feed_item_description', 'make_clickable' );
 
+add_filter( 'bp_get_activity_action', 'stripslashes_deep' );
 add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_content_body', 'stripslashes_deep' );
 add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
 add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );

trunk/bp-groups.php

@@ -1628 +1628 @@
     }
 
+    $membership = new BP_Groups_Member( $user_id, $group_id );
+
     // This is exactly the same as deleting an invite, just is_confirmed = 1 NOT 0.
     if ( !groups_uninvite_user( $user_id, $group_id ) )
@@ -1637 +1639 @@
     /* Modify user's group memberhip count */
     update_usermeta( $user_id, 'total_group_count', (int) get_usermeta( $user_id, 'total_group_count') - 1 );
+
+    /* If the user joined this group less than five minutes ago, remove the joined_group activity so
+     * users cannot flood the activity stream by joining/leaving the group in quick succession.
+     */
+    if ( function_exists( 'bp_activity_delete' ) && gmmktime() <= strtotime( '+5 minutes', (int)strtotime( $membership->date_modified ) ) )
+        bp_activity_delete( array( 'component' => $bp->groups->id, 'type' => 'joined_group', 'user_id' => $user_id, 'item_id' => $group_id ) );
 
     bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );