Changeset 1839

Timestamp:

09/10/2009 01:24:01 AM (14 years ago)

Author:

apeatling

Message:

Added support for significantly more advanced activity stream filtering.

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (6 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (6 diffs)

trunk/bp-activity.php

@@ -352 +352 @@
 }
 
-function bp_activity_get_user_activity( $user_id, $max_items = 30, $since = '-4 weeks', $pag_num = false, $pag_page = false, $filter = false ) {
-    return BP_Activity_Activity::get_activity_for_user( $user_id, $max_items, $since, $pag_num, $pag_page, $filter );
-}
-
-function bp_activity_get_friends_activity( $user_id, $max_items = 30, $since = '-4 weeks', $max_items_per_friend = false, $pag_num = false, $pag_page = false, $filter = false ) {
-    return BP_Activity_Activity::get_activity_for_friends( $user_id, $max_items, $since, $max_items_per_friend, $pag_num, $pag_page, $filter );
+function bp_activity_get_user_activity( $user_id, $max_items = 30, $pag_num = false, $pag_page = false, $filter = false ) {
+    return BP_Activity_Activity::get_activity_for_user( $user_id, $max_items, $pag_num, $pag_page, $filter );
+}
+
+function bp_activity_get_friends_activity( $user_id, $max_items = 30, $max_items_per_friend = false, $pag_num = false, $pag_page = false, $filter = false ) {
+    return BP_Activity_Activity::get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $pag_num, $pag_page, $filter );
 }
 

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

@@ -144 +144 @@
     }
     
-    function get_activity_for_user( $user_id, $max_items, $since, $limit, $page, $filter ) {
+    function get_activity_for_user( $user_id, $max_items, $limit, $page, $filter ) {
         global $wpdb, $bp;
 
@@ -155 +155 @@
             $max_sql = $wpdb->prepare( "LIMIT %d", $max_items );
         
+        /* Sort out filtering */
         if ( $filter )
-            $filter_sql = $wpdb->prepare( "AND component_name = %s", $filter );
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
         
         if ( $limit && $page && $max_items )
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d AND date_recorded >= FROM_UNIXTIME(%d) $privacy_sql $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id, $since ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $privacy_sql $filter_sql ORDER BY date_recorded DESC $pag_sql", $user_id ) );
         else
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d AND date_recorded >= FROM_UNIXTIME(%d) $privacy_sql $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id, $since ) );
-        
-        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d AND date_recorded >= FROM_UNIXTIME(%d) $privacy_sql $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id, $since ) );
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d $privacy_sql $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $user_id ) );
+        
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d $privacy_sql $filter_sql ORDER BY date_recorded DESC $max_sql", $user_id ) );
         
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
     }
     
-    function get_activity_for_friends( $user_id, $max_items, $since, $max_items_per_friend, $limit, $page, $filter ) {
+    function get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $limit, $page, $filter ) {
         global $wpdb, $bp;
         
@@ -182 +183 @@
             $max_sql = $wpdb->prepare( "LIMIT %d", $max_items );
 
+        /* Sort out filtering */
         if ( $filter )
-            $filter_sql = $wpdb->prepare( "AND component_name = %s", $filter );
-
-        $since = strtotime($since);
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
 
         $friend_ids = friends_get_friend_user_ids( $user_id );
@@ -195 +195 @@
         
         if ( $limit && $page && $max_items )
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) $filter_sql ORDER BY date_recorded DESC $pag_sql", $since ) ); 
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql"  ) ); 
         else
-            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql", $since ) );             
-
-        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) AND date_recorded >= FROM_UNIXTIME(%d) $filter_sql ORDER BY date_recorded DESC $max_sql", $since ) ); 
+            $activities = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT user_id, content, primary_link, date_recorded, component_name, component_action FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $pag_sql $max_sql" ) );            
+
+        $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->activity->table_name} WHERE user_id IN ({$friend_ids}) $filter_sql ORDER BY date_recorded DESC $max_sql" ) ); 
         
         return array( 'activities' => $activities, 'total' => (int)$total_activities );
@@ -212 +212 @@
         if ( $max )
             $max_sql = $wpdb->prepare( "LIMIT %d", $max );
-
+            
+        /* Sort out filtering */
         if ( $filter )
-            $filter_sql = $wpdb->prepare( "AND component_name = %s", $filter );
-
+            $filter_sql = BP_Activity_Activity::get_filter_sql( $filter );
+        
         if ( $limit && $page && $max )
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE hide_sitewide = 0 $filter_sql ORDER BY date_recorded DESC $pag_sql" ) );
@@ -248 +249 @@
     }
     
+    function get_filter_sql( $filter_array ) {
+        global $wpdb;
+        
+        if ( !empty( $filter_array['object'] ) ) {
+            $object_filter = explode( ',', $filter_array['object'] );
+            $object_sql = ' AND ( ';
+            
+            $counter = 1;
+            foreach( (array) $object_filter as $object ) {
+                $object_sql .= $wpdb->prepare( "component_name = %s", trim( $object ) );
+                
+                if ( $counter != count( $object_filter ) )
+                    $object_sql .= ' || ';
+                
+                $counter++;
+            }
+            
+            $object_sql .= ' )';
+        }
+
+        if ( !empty( $filter_array['action'] ) ) {
+            $action_filter = explode( ',', $filter_array['action'] );
+            $action_sql = ' AND ( ';
+            
+            $counter = 1;
+            foreach( (array) $action_filter as $action ) {
+                $action_sql .= $wpdb->prepare( "component_action = %s", trim( $action ) );
+                
+                if ( $counter != count( $action_filter ) )
+                    $action_sql .= ' || ';
+                
+                $counter++;
+            }
+            
+            $action_sql .= ' )';
+        }
+
+        if ( !empty( $filter_array['primary_id'] ) ) {
+            $pid_filter = explode( ',', $filter_array['action'] );
+            $pid_sql = ' AND ( ';
+            
+            $counter = 1;
+            foreach( (array) $pid_filter as $pid ) {
+                $pid_sql .= $wpdb->prepare( "item_id = %s", trim( $pid ) );
+                
+                if ( $counter != count( $pid_filter ) )
+                    $pid_sql .= ' || ';
+                
+                $counter++;
+            }
+            
+            $pid_sql .= ' )';
+        }
+
+        if ( !empty( $filter_array['secondary_id'] ) ) {
+            $sid_filter = explode( ',', $filter_array['action'] );
+            $sid_sql = ' AND ( ';
+            
+            $counter = 1;
+            foreach( (array) $sid_filter as $sid ) {
+                $sid_sql .= $wpdb->prepare( "secondary_item_id = %s", trim( $sid ) );
+                
+                if ( $counter != count( $sid_filter ) )
+                    $sid_sql .= ' || ';
+                
+                $counter++;
+            }
+            
+            $sid_sql .= ' )';
+        }
+        
+        return $object_sql . $action_sql . $pid_sql . $sid_sql;
+    }
+    
     function get_last_updated() {
         global $bp, $wpdb;

trunk/bp-activity/bp-activity-templatetags.php

@@ -17 +17 @@
     var $full_name;
 
-    function bp_activity_template( $type, $user_id, $per_page, $max, $timeframe, $filter ) {
+    function bp_activity_template( $type, $user_id, $per_page, $max, $filter ) {
         global $bp;
 
@@ -28 +28 @@
         
         if ( $type == 'personal' )
-            $this->activities = bp_activity_get_user_activity( $user_id, $max, $timeframe, $this->pag_num, $this->pag_page, $filter );
+            $this->activities = bp_activity_get_user_activity( $user_id, $max, $this->pag_num, $this->pag_page, $filter );
 
         if ( $type == 'friends' && ( bp_is_home() || is_site_admin() || $bp->loggedin_user->id == $user_id ) )
-            $this->activities = bp_activity_get_friends_activity( $user_id, $max, $timeframe, false, $this->pag_num, $this->pag_page, $filter );
+            $this->activities = bp_activity_get_friends_activity( $user_id, $max, false, $this->pag_num, $this->pag_page, $filter );
         
         if ( !$max || $max >= (int)$this->activities['total'] )
@@ -89 +89 @@
             return true;
         } elseif ( $this->current_activity + 1 == $this->activity_count ) {
-            do_action('loop_end');
+            do_action('activity_loop_end');
             // Do some cleaning up after the loop
             $this->rewind_activities();
@@ -108 +108 @@
 
         if ( $this->current_activity == 0 ) // loop has just started
-            do_action('loop_start');
+            do_action('activity_loop_start');
     }
 }
@@ -125 +125 @@
 function bp_has_activities( $args = '' ) {
     global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
-
+    
+    /* Note: any params used for filtering can be a single value, or multiple values comma seperated. */
+    
     $defaults = array(
         'type' => 'sitewide',
-        'user_id' => false,
         'per_page' => 25,
         'max' => false,
-        'timeframe' => '-4 weeks',
-        'filter' => false
+        'user_id' => false, // user_id to filter on
+        'object' => false, // object to filter on e.g. groups, profile, status, friends
+        'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated
+        'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
+        'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
     );
 
@@ -162 +166 @@
     
     if ( isset( $_GET['afilter'] ) )
-        $filter = $_GET['afilter'];
-
-    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $timeframe, $filter );       
+        $filter = array( 'object' => $_GET['afilter'] );
+    else
+        $filter = array( 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
+    
+    $activities_template = new BP_Activity_Template( $type, $user_id, $per_page, $max, $filter );       
     return $activities_template->has_activities();
 }