Ticket #5505: 5505.patch

bp-activity/bp-activity-classes.php

@@ -1177 +1177 @@
          * @since BuddyPress (1.5.0)
          *
          * @param array $filter_array {
-         *     Fields and values to filter by. Each can be either a single
-         *     string, a comma-separated list, or an array of values.
+         *     Fields and values to filter by.
          *     @type array|string|id $user_id User ID(s).
          *     @type array|string $object Corresponds to the 'component'
          *           column in the database.
@@ -1188 +1187 @@
          *           column in the database.
          *     @type array|string|int $secondary_id Corresponds to the
          *           'secondary_item_id' column in the database.
+         *     @type int $offset Return only those items with an ID greater
+         *           than the offset value.
+         *     @type string $since Return only those items that have a
+         *           date_recorded value greater than a given MySQL-formatted
+         *           date.
          * }
          * @return string The filter clause, for use in a SQL query.
          */
@@ -1230 +1234 @@
                         $filter_sql[] = "a.id >= {$sid_sql}";
                 }
 
+                if ( ! empty( $filter_array['since'] ) ) {
+                        // Validate that this is a proper Y-m-d H:i:s date
+                        // Trick: parse to UNIX date then translate back
+                        $translated_date = date( 'Y-m-d H:i:s', strtotime( $filter_array['since'] ) );
+                        if ( $translated_date === $filter_array['since'] ) {
+                                $filter_sql[] = "a.date_recorded > '{$translated_date}'";
+                        }
+                }
+
                 if ( empty( $filter_sql ) )
                         return false;
 

bp-activity/bp-activity-filters.php

@@ -451 +451 @@
 function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) {
         $bp = buddypress();
 
-        if ( empty( $data['bp_activity_last_id'] ) ) {
+        if ( empty( $data['bp_activity_last_recorded'] ) ) {
                 return $response;
         }
 
@@ -459 +459 @@
         // filters), but force the offset to get only new items
         $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
         add_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
@@ -474 +474 @@
                 while ( bp_activities() ) {
                         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;
                         }
 
                         bp_get_template_part( 'activity/entry' );
                 }
         }
 
-        $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();
 
         // Remove the temporary filter

bp-activity/bp-activity-template.php

@@ -547 +547 @@
                 'primary_id'        => $primary_id,  // 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
                 'offset'            => false,        // return only items >= this ID
+                'since'             => false,        // return only items recorded since this Y-m-d H:i:s date
 
                 'meta_query'        => false,        // filter on activity meta. See WP_Meta_Query for format
 
@@ -2805 +2806 @@
  */
 function bp_activity_recurse_comments_activity_ids( $activity = array(), $activity_ids = array() ) {
         if ( is_array( $activity ) && ! empty( $activity['activities'] ) ) {
-                $activity = $activity['activities'][0]; 
+                $activity = $activity['activities'][0];
         }
 
         if ( ! empty( $activity->children ) ) {

bp-templates/bp-legacy/js/buddypress.js

@@ -1508 +1508 @@
 
         // Increment newest_activities and activity_last_id if data has been returned
         jq( document ).on( 'heartbeat-tick', function( e, data ) {
+                console.log(data);
 
                 // Only proceed if we have newest activities
                 if ( ! data['bp_activity_newest_activities'] ) {

tests/testcases/activity/class.BP_Activity_Activity.php

@@ -282 +282 @@
                 $ids = wp_list_pluck( $activity['activities'], 'id' );
                 $this->assertEquals( array( $a3, $a2 ), $ids );
         }
+
+        /**
+         * @group get
+         */
+        public function test_get_with_since() {
+                $now = time();
+                $a1 = $this->factory->activity->create( array(
+                        'content' => 'Life Rules',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+                ) );
+                $a2 = $this->factory->activity->create( array(
+                        'content' => 'Life Drools',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
+                ) );
+                $a3 = $this->factory->activity->create( array(
+                        'content' => 'Life Drools',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ),
+                ) );
+
+                $activity = BP_Activity_Activity::get( array(
+                        'filter' => array(
+                                'since' => date( 'Y-m-d H:i:s', $now - 70 ),
+                        ),
+                ) );
+                $ids = wp_list_pluck( $activity['activities'], 'id' );
+                $this->assertEquals( array( $a3, $a2 ), $ids );
+        }
+
         /**
          * @group get_id
          */