Changeset 13344 for trunk/src/bp-activity/bp-activity-template.php

Timestamp:

10/25/2022 07:33:13 PM (3 years ago)

Author:

imath

Message:

Improve the activity loop to be able to get items below a max. ID

The $filter parameter of this loop now includes a new $offset_lower
argument making it possible to only retrieve activities having an ID
lower than this argument provided value.

We are using this filter to avoid a possible activity duplicate when
clicking on the "Load More" link.

Closes ​https://github.com/buddypress/buddypress/pull/29
Fixes #4535

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (4 diffs)

trunk/src/bp-activity/bp-activity-template.php

@@ -273 +273 @@
             'secondary_id'      => false,        // Secondary object ID to filter on e.g. a post_id.
             'offset'            => false,        // Return only items >= this ID.
+            'offset_lower'      => false,        // Return only items < this ID.
             'since'             => false,        // Return only items recorded since this Y-m-d H:i:s date.
 
@@ -327 +328 @@
             'object' => $_GET['afilter']
         );
-    } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['since'] ) ) {
+    } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['offset_lower'] ) || ! empty( $r['since'] ) ) {
         $r['filter'] = array(
             'user_id'      => $r['user_id'],
@@ -335 +336 @@
             'secondary_id' => $r['secondary_id'],
             'offset'       => $r['offset'],
+            'offset_lower' => $r['offset_lower'],
             'since'        => $r['since']
         );
@@ -411 +413 @@
         global $activities_template;
 
-        $url  = bp_get_requested_url();
-        $link = add_query_arg( $activities_template->pag_arg, $activities_template->pag_page + 1, $url );
+        $url            = bp_get_requested_url();
+        $load_more_args = array(
+            $activities_template->pag_arg => $activities_template->pag_page + 1,
+        );
+
+        // 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;
+        }
+
+        $link = add_query_arg( $load_more_args, $url );
 
         /**