<!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][13248] branches/10.0: Clear the user notification cache when bulk marking as unread items</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/13248">13248</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/13248","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>2022-02-25 13:45:23 +0000 (Fri, 25 Feb 2022)</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'>Clear the user notification cache when bulk marking as unread items
Props oztaser, niftythree
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8642">#8642</a> (branch 10.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches100srcbpnotificationsbpnotificationscachephp">branches/10.0/src/bp-notifications/bp-notifications-cache.php</a></li>
<li><a href="#branches100testsphpunittestcasesnotificationscachephp">branches/10.0/tests/phpunit/testcases/notifications/cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches100srcbpnotificationsbpnotificationscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/10.0/src/bp-notifications/bp-notifications-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/10.0/src/bp-notifications/bp-notifications-cache.php 2022-02-25 13:37:47 UTC (rev 13247)
+++ branches/10.0/src/bp-notifications/bp-notifications-cache.php 2022-02-25 13:45:23 UTC (rev 13248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,11 +104,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the list of user IDs from notification IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $where_args['ids'] ) && $where_args['ids'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = (array) $where_args['ids'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids = (array) $where_args['ids'];
+ $is_new = 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $update_args['data']['is_new'] ) && 1 === $update_args['data']['is_new'] ) {
+ $is_new = 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $ns = BP_Notifications_Notification::get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'id' => $ids,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => $ids,
+ 'is_new' => $is_new,
</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">
</span></span></pre></div>
<a id="branches100testsphpunittestcasesnotificationscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/10.0/tests/phpunit/testcases/notifications/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/10.0/tests/phpunit/testcases/notifications/cache.php 2022-02-25 13:37:47 UTC (rev 13247)
+++ branches/10.0/tests/phpunit/testcases/notifications/cache.php 2022-02-25 13:45:23 UTC (rev 13248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,6 +228,37 @@
</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 cache
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket BP8642
+ */
+ public function test_bp_notifications_clear_all_for_user_cache_before_update_when_marked_unread() {
+ $u = self::factory()->user->create();
+ $a = self::factory()->activity->create();
+
+ $notification_ids = self::factory()->notification->create_many(
+ 4,
+ array(
+ 'component_name' => 'activity',
+ 'component_action' => 'at_mentions',
+ 'user_id' => $u,
+ 'item_id' => $a,
+ 'is_new' => 0,
+ 'allow_duplicate' => true,
+ )
+ );
+
+ $all_for_user_notifications = bp_notifications_get_all_notifications_for_user( $u );
+ $this->assertEmpty( $all_for_user_notifications );
+
+ // Mark as unread.
+ $amount = bp_notifications_mark_notifications_by_ids( $notification_ids, 1 );
+ $this->assertTrue( $amount === count( $notification_ids ) );
+
+ $all_for_user_notifications = bp_notifications_get_all_notifications_for_user( $u );
+ $this->assertEquals( $notification_ids, wp_list_pluck( $all_for_user_notifications, 'id' ) );
+ }
+
+ /**
+ * @group cache
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP8637
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_notifications_clear_all_for_user_cache_before_delete() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,6 +347,51 @@
</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 cache
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket BP8642
+ */
+ public function test_bp_notifications_clear_all_for_user_cache_before_update_when_item_ids_and_marked_unread() {
+ $s = self::factory()->user->create();
+ $r = self::factory()->user->create();
+ $notification_ids = array();
+
+ remove_action( 'messages_message_sent', 'bp_messages_message_sent_add_notification', 10 );
+
+ $message_ids = self::factory()->message->create_many(
+ 4,
+ array(
+ 'sender_id' => $s,
+ 'recipients' => array( $r ),
+ 'content' => 'testing notification all for user cache',
+ )
+ );
+
+ foreach ( $message_ids as $message_id ) {
+ $notification_ids[] = self::factory()->notification->create(
+ array(
+ 'component_name' => 'messages',
+ 'component_action' => 'new_message',
+ 'user_id' => $r,
+ 'item_id' => $message_id,
+ 'is_new' => 0,
+ )
+ );
+ }
+
+ add_action( 'messages_message_sent', 'bp_messages_message_sent_add_notification', 10 );
+
+ $all_for_user_notifications = bp_notifications_get_all_notifications_for_user( $r );
+ $this->assertEmpty( $all_for_user_notifications );
+
+ // Mark unread.
+ $amount = bp_notifications_mark_notifications_by_item_ids( $r, $message_ids, 'messages', 'new_message', 1 );
+ $this->assertTrue( $amount === count( $message_ids ) );
+
+ $all_for_user_notifications = bp_notifications_get_all_notifications_for_user( $r );
+ $this->assertEquals( $message_ids, wp_list_pluck( $all_for_user_notifications, 'item_id' ) );
+ }
+
+ /**
+ * @group cache
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP8637
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_notifications_clear_all_for_user_cache_before_delete_when_item_ids() {
</span></span></pre>
</div>
</div>
</body>
</html>