<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13724] trunk: Activity: make sure streams are paginated the right way</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13724">13724</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13724","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-14 06:26:17 +0000 (Wed, 14 Feb 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Activity: make sure streams are paginated the right way
In <a href="http://buddypress.trac.wordpress.org/changeset/13344">[13344]</a> 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
See <a href="http://buddypress.trac.wordpress.org/ticket/9094">#9094</a>
Closes https://github.com/buddypress/buddypress/pull/229</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp">trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-template.php 2024-02-08 17:39:24 UTC (rev 13723)
+++ trunk/src/bp-activity/bp-activity-template.php 2024-02-14 06:26:17 UTC (rev 13724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,10 +425,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activities_template->pag_arg => $activities_template->pag_page + 1,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( $load_more_args, $url );
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2024-02-08 17:39:24 UTC (rev 13723)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2024-02-14 06:26:17 UTC (rev 13724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1978,7 +1978,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $filter_array['offset_lower'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sid_sql = absint( $filter_array['offset_lower'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter_sql[] = "a.id < {$sid_sql}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_sql[] = "a.id <= {$sid_sql}";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $filter_array['since'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2024-02-08 17:39:24 UTC (rev 13723)
+++ trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2024-02-14 06:26:17 UTC (rev 13724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,101 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group get
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket BP9094
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_with_user_id__in() {
</span><span class="cx" style="display: block; padding: 0 10px"> $u1 = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = self::factory()->user->create();
</span></span></pre>
</div>
</div>
</body>
</html>