Changeset 13725

Timestamp:

02/14/2024 06:37:43 AM (2 years ago)

Author:

imath

Message:

Activity: make sure streams are paginated the right way

In [13344] we made sure to avoid the last entry(ies) of the stream to be duplicated if some other members published other entry(ies) just before a user clicked on the "Load More" link.

2 mistakes were made while generating the BP_Activity_Activity MySQL query clause as well as the Load More link query variable causing a regression as some activity entries were wrongly skipped from display each time a user was clicking on this link.

1. The MySQL query clause built in BP_Activity_Activity::get_filter_sql() needs to also include the last inserted Activity ID using the <= operator instead of the < one.
2. The query variable added to the Load More link needs to remain the last inserted Activity ID at the time the stream is first displayed.

Props testovac
Antiprops imath

Fixes #9094 (branch 12.0)

Location:

branches/12.0

Files:

• src/bp-activity/bp-activity-template.php (modified) (1 diff)
• src/bp-activity/classes/class-bp-activity-activity.php (modified) (1 diff)
• tests/phpunit/testcases/activity/class.BP_Activity_Activity.php (modified) (1 diff)

branches/12.0/src/bp-activity/bp-activity-template.php

@@ -426 +426 @@
         );
 
-        // Try to include the offset arg.
-        $last_displayed_activity = reset( $activities_template->activities );
-        if ( isset( $last_displayed_activity->id ) && $last_displayed_activity->id ) {
-            $load_more_args['offset_lower'] = (int) $last_displayed_activity->id;
+        // Use the first posted offset arg to transport it for each following page links.
+        if ( isset( $_POST['offset_lower'] ) && $_POST['offset_lower'] ) {
+            $load_more_args['offset_lower'] = (int) wp_unslash( $_POST['offset_lower'] );
+
+            // Try to include the offset arg to the second page link.
+        } elseif ( 1 === $activities_template->pag_page ) {
+            $last_displayed_activity = reset( $activities_template->activities );
+            if ( isset( $last_displayed_activity->id ) && $last_displayed_activity->id ) {
+                $load_more_args['offset_lower'] = (int) $last_displayed_activity->id;
+            }
         }
 

branches/12.0/src/bp-activity/classes/class-bp-activity-activity.php

@@ -1979 +1979 @@
         if ( ! empty( $filter_array['offset_lower'] ) ) {
             $sid_sql = absint( $filter_array['offset_lower'] );
-            $filter_sql[] = "a.id < {$sid_sql}";
+            $filter_sql[] = "a.id <= {$sid_sql}";
         }
 

branches/12.0/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -429 +429 @@
     /**
      * @group get
+     * @ticket BP9094
+     */
+    public function test_get_with_offset_lower() {
+        $now = time();
+        $a1  = self::factory()->activity->create(
+            array(
+                'content' => 'Happy Valentine’s day',
+                'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+            )
+        );
+        $a2  = self::factory()->activity->create(
+            array(
+                'content' => 'Happy new year',
+                'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
+            )
+        );
+        $a3  = self::factory()->activity->create(
+            array(
+                'content' => 'Happy days',
+                'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ),
+            )
+        );
+
+        $activity = BP_Activity_Activity::get(
+            array(
+                'filter' => array(
+                    'offset_lower' => $a2,
+                ),
+            )
+        );
+
+        $ids = wp_list_pluck( $activity['activities'], 'id' );
+        $this->assertEquals( array( $a2, $a1 ), $ids );
+    }
+
+    /**
+     * @group get
+     * @ticket BP9094
+     */
+    public function test_get_with_offset_lower_with_pagination() {
+        $a = self::factory()->activity->create_many(
+            3,
+            array(
+                'type' => 'activity_update',
+            )
+        );
+
+        $stream = BP_Activity_Activity::get(
+            array(
+                'page'              => 1,
+                'per_page'          => 2,
+                'filter' => array(
+                    'offset_lower' => end( $a ),
+                ),
+            )
+        );
+
+        $page_one_ids                 = wp_list_pluck( $stream['activities'], 'id' );
+        $last_displayed_on_first_page = end( $page_one_ids );
+
+        $a1 = self::factory()->activity->create(
+            array(
+                'content' => 'Ouch this is an Auto Refresh simulation',
+            )
+        );
+
+        $stream = BP_Activity_Activity::get(
+            array(
+                'page'              => 2,
+                'per_page'          => 2,
+            )
+        );
+
+        $page_two_ids                = wp_list_pluck( $stream['activities'], 'id' );
+        $first_displayed_on_page_two = reset( $page_two_ids );
+        $this->assertEquals( $first_displayed_on_page_two, $last_displayed_on_first_page );
+
+        $stream = BP_Activity_Activity::get(
+            array(
+                'page'              => 2,
+                'per_page'          => 2,
+                'filter' => array(
+                    'offset_lower' => end( $a ),
+                ),
+            )
+        );
+
+        $without_auto_refresh = wp_list_pluck( $stream['activities'], 'id' );
+        $this->assertFalse( in_array( $last_displayed_on_first_page, $without_auto_refresh, true ) );
+        $this->assertSame( array_reverse( $a ), array_merge( $page_one_ids, $without_auto_refresh ) );
+    }
+
+    /**
+     * @group get
      */
     public function test_get_with_user_id__in() {