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

Timestamp:

10/09/2008 04:37:49 AM (18 years ago)

Author:

apeatling

Message:

• Moved all group pages to the root, rather than using a member URL
• Introduced groupmeta support - groups_update_groupmeta / groups_delete_groupmeta / groups_get_groupmeta
• Added widgets for site wide activity and who's online
• Updated home theme to support display of new BuddyPress widgets
• Added site wide activity feed support
• Fixed bug where ajax functions would only work when logged in
• Various other bug fixes

File:

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

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

@@ -67 +67 @@
                         $activity_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name_cached . " ( content, component_name, date_cached, date_recorded, is_private ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d )", $activity_content, $this->component_name, time(), $this->date_recorded, $this->is_private ) );
                 
+                        // Add the cached version of the activity to the cached activity table.
+                        $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, component_name, date_cached, date_recorded ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $bp['loggedin_userid'], $activity_content, $this->component_name, time(), $this->date_recorded ) );
+                        
                         if ( $activity && $activity_cached )
                                 return true;
@@ -104 +107 @@
                 $last_cached = get_usermeta( $bp['current_userid'], 'bp_activity_last_cached' );
                 
-                if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) >= time() ) {
+                if ( strtotime( BP_ACTIVITY_CACHE_LENGTH, (int)$last_cached ) <= time() ) {
                         
                         //echo '<small style="color: green">** Debug: Using Cache **</small>';
@@ -140 +143 @@
                                         unset($activities_formatted[$i]);
                         }
-                        
+                
                         if ( count($activities_formatted) )
-                                BP_Activity_Activity::cache_activities( $activities_formatted );
+                                BP_Activity_Activity::cache_activities( $activities_formatted, $user_id );
                 }
                 
@@ -209 +212 @@
         }
         
+        function get_sitewide_activity( $limit = 15 ) {
+                global $wpdb, $bp;
+                
+                if ( $limit )
+                        $limit_sql = $wpdb->prepare( " LIMIT %d", $limit );
+                
+                /* Remove entries that are older than 1 week */
+                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE DATE_ADD(date_recorded, INTERVAL 1 WEEK) <= NOW()" ) );
+                
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['activity']['table_name_sitewide'] . " ORDER BY date_recorded DESC $limit_sql" ) );
+                
+                for ( $i = 0; $i < count( $activities ); $i++ ) {
+                        $activities_formatted[$i]['content'] = $activities[$i]->content;
+                        $activities_formatted[$i]['date_recorded'] = $activities[$i]->date_recorded;
+                        $activities_formatted[$i]['component_name'] = $activities[$i]->component_name;
+                }
+                
+                return $activities_formatted;
+        }
+        
         function cache_friends_activities( $activity_array ) {
                 global $wpdb, $bp;
@@ -223 +246 @@
         }
         
-        function cache_activities( $activity_array ) {
+        function cache_activities( $activity_array, $user_id ) {
                 global $wpdb, $bp;
                 
@@ -229 +252 @@
                 $wpdb->query( "TRUNCATE TABLE " . $bp['activity']['table_name_current_user_cached'] );
                 
+                /* Empty user's activities from the sitewide stream */
+                $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['activity']['table_name_sitewide'] . " WHERE user_id = %d", $user_id ) );
+                
                 for ( $i = 0; $i < count($activity_array); $i++ ) {
+                        if ( $activity_array[$i]['content'] == '' ) continue;
+                        
                         // Cache that sucka...
                         $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_current_user_cached'] . " ( content, component_name, date_cached, date_recorded, is_private ) VALUES ( %s, %s, FROM_UNIXTIME(%d), %s, %d )", $activity_array[$i]['content'], $activity_array[$i]['component_name'], time(), $activity_array[$i]['date_recorded'], $activity_array[$i]['is_private'] ) );
+                        
+                        // Add to the sitewide activity stream
+                        if ( !$activity_array[$i]['is_private'] )
+                                $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, component_name, date_cached, date_recorded ) VALUES ( %d, %s, %s, FROM_UNIXTIME(%d), %s )", $user_id, $activity_array[$i]['content'], $activity_array[$i]['component_name'], time(), $activity_array[$i]['date_recorded'] ) );
                 }