Changeset 8251 for trunk/bp-activity/bp-activity-filters.php

Timestamp:

04/08/2014 06:55:30 AM (11 years ago)

Author:

imath

Message:

Insert a new "since" filter for the activity stream to be used by HeartBeat check feature

In rare cases, the field date_recorded of the activity table can be updated to a date greater than the most recent activity in terms of id.
The Heartbeat feature was based on the id field so far, while the activity stream is sorting items according to the date_recorded field. As a result, in this very particular case, activities with an id greater than the activity (which date has been updated) will be loaded again in the stream and this until a new activity is published.
To prevent this to happen, we introduce this new "since" filter to be used by the HeartBeat feature once it gets the timestamp of the most recent activity displayed in the stream.

props SGr33n, boonebgorges, imath

Fixes #5505

File:

• trunk/bp-activity/bp-activity-filters.php (modified) (8 diffs)

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

@@ -430 +430 @@
     $bp = buddypress();
 
-    if ( ! empty( $bp->activity->new_update_id ) && $bp->activity->new_update_id == bp_get_activity_id() ) {
+    if ( ! empty( $bp->activity->last_recorded ) && $bp->activity->last_recorded == bp_get_activity_date_recorded() ) {
         $classes .= ' new-update';
     }
@@ -439 +439 @@
 
 /**
+ * Check if Activity Heartbeat feature i on to add a timestamp class.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param string $classes
+ * @return string $classes
+ */
+function bp_activity_timestamp_class( $classes = '' ) {
+
+    if ( ! bp_activity_do_heartbeat() ) {
+        return $classes;
+    }
+
+    $activity_date = bp_get_activity_date_recorded();
+
+    if ( empty( $activity_date ) ) {
+        return $classes;
+    }
+    
+    $classes .= ' date-recorded-' . strtotime( $activity_date );
+
+    return $classes;
+}
+add_filter( 'bp_get_activity_css_class', 'bp_activity_timestamp_class', 9, 1 );
+
+/**
  * Use WordPress Heartbeat API to check for latest activity update.
  *
@@ -444 +470 @@
  *
  * @uses bp_activity_get_last_updated() to get the recorded date of the last activity
-
+ *
  * @param array $response
  * @param array $data
@@ -452 +478 @@
     $bp = buddypress();
 
-    if ( empty( $data['bp_activity_last_id'] ) ) {
+    if ( empty( $data['bp_activity_last_recorded'] ) ) {
         return $response;
     }
@@ -460 +486 @@
     $activity_latest_args = bp_parse_args(
         bp_ajax_querystring( 'activity' ),
-        array( 'offset' => absint( $data['bp_activity_last_id'] ) + 1 ),
+        array( 'since' => date( 'Y-m-d H:i:s', $data['bp_activity_last_recorded'] ) ),
         'activity_latest_args'
     );
 
     $newest_activities = array();
-    $last_activity_id  = 0;
+    $last_activity_recorded = 0;
 
     // Temporarly add a just-posted class for new activity items
@@ -475 +501 @@
             bp_the_activity();
 
-            if ( $last_activity_id < bp_get_activity_id() ) {
-                $last_activity_id = bp_get_activity_id();
+            $atime = strtotime( bp_get_activity_date_recorded() );
+            if ( $last_activity_recorded < $atime ) {
+                $last_activity_recorded = $atime;
             }
 
@@ -483 +510 @@
     }
 
-    $newest_activities['activities'] = ob_get_contents();
-    $newest_activities['last_id']    = $last_activity_id;
+    $newest_activities['activities']    = ob_get_contents();
+    $newest_activities['last_recorded'] = $last_activity_recorded;
     ob_end_clean();
 
@@ -490 +517 @@
     remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
 
-    if ( ! empty( $newest_activities['last_id'] ) ) {
+    if ( ! empty( $newest_activities['last_recorded'] ) ) {
         $response['bp_activity_newest_activities'] = $newest_activities;
     }