<!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][12222] trunk: Notifications: clear activity notifications for replies to updates and comments.</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/12222">12222</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/12222","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-09-07 13:52:27 +0000 (Fri, 07 Sep 2018)</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'>Notifications: clear activity notifications for replies to updates and comments.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7907">#7907</a>
Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitynotificationsphp">trunk/src/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivitynotificationsphp">trunk/tests/phpunit/testcases/activity/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitynotificationsphp"></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-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-notifications.php 2018-09-07 13:45:54 UTC (rev 12221)
+++ trunk/src/bp-activity/bp-activity-notifications.php 2018-09-07 13:52:27 UTC (rev 12222)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( 'You have %1$d new replies', 'buddypress' ), (int) $total_items );
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 'multiple';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = add_query_arg( 'nid', (int) $id, bp_activity_get_permalink( $activity_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = add_query_arg( 'rid', (int) $id, bp_activity_get_permalink( $activity_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( '%1$s commented on one of your updates', 'buddypress' ), $user_fullname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +70,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( 'You have %1$d new comment replies', 'buddypress' ), (int) $total_items );
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 'multiple';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = add_query_arg( 'nid', (int) $id, bp_activity_get_permalink( $activity_id ) );
- $text = sprintf( __( '%1$s replied to one your activity comments', 'buddypress' ), $user_fullname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = add_query_arg( 'crid', (int) $id, bp_activity_get_permalink( $activity_id ) );
+ $text = sprintf( __( '%1$s replied to one of your activity comments', 'buddypress' ), $user_fullname );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,9 +226,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_activity_clear_new_mentions', 'bp_activity_remove_screen_notifications', 10, 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">- * Mark at-mention notification as read when user visits the activity with the mention.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Mark notifications as read when a user visits an activity permalink.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.2.0 Marks replies to parent update and replies to an activity comment as read.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_Activity_Activity $activity Activity object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,6 +240,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mark as read any notifications for the current user related to this activity item.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), $activity->id, buddypress()->activity->id, 'new_at_mention' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $comment_id = 0;
+ // For replies to a parent update.
+ if ( ! empty( $_GET['rid'] ) ) {
+ $comment_id = (int) $_GET['rid'];
+
+ // For replies to an activity comment.
+ } elseif ( ! empty( $_GET['crid'] ) ) {
+ $comment_id = (int) $_GET['crid'];
+ }
+
+ // Mark individual activity reply notification as read.
+ if ( ! empty( $comment_id ) ) {
+ BP_Notifications_Notification::update(
+ array(
+ 'is_new' => false
+ ),
+ array(
+ 'user_id' => bp_loggedin_user_id(),
+ 'id' => $comment_id
+ )
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications_single_activity_permalink' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivitynotificationsphp"></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/notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/notifications.php 2018-09-07 13:45:54 UTC (rev 12221)
+++ trunk/tests/phpunit/testcases/activity/notifications.php 2018-09-07 13:52:27 UTC (rev 12222)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,6 +364,41 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_commenter = array( $u3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected_commenter, wp_list_pluck( $u2_notifications, 'secondary_item_id' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Attempt to mark 'update_reply' notifications as read for user 1.
+ foreach ( $u1_notifications as $i => $n ) {
+ $n = bp_activity_format_notifications( $n->component_action, $n->item_id, $n->secondary_item_id, 1, 'array', $n->id );
+ if ( ! empty( $n['link'] ) ) {
+ // Remove redirecter for unit tests.
+ $n['link'] = str_replace( '/p/', '/', $n['link'] );
+
+ // Attempt to clear the notification by going to the activity permalink.
+ $this->go_to( $n['link'] );
+ }
+ }
+
+ // Assert that notifications for user 1 are cleared and empty.
+ $this->assertEmpty( BP_Notifications_Notification::get( array(
+ 'user_id' => $this->u1,
+ ) ) );
+
+ // Attempt to mark 'comment_reply' notifications as read for user 2.
+ $this->set_current_user( $this->u2 );
+ foreach ( $u2_notifications as $i => $n ) {
+ $n = bp_activity_format_notifications( $n->component_action, $n->item_id, $n->secondary_item_id, 1, 'array', $n->id );
+ if ( ! empty( $n['link'] ) ) {
+ // Remove redirecter for unit tests.
+ $n['link'] = str_replace( '/p/', '/', $n['link'] );
+
+ // Attempt to clear the notification by going to the activity permalink.
+ $this->go_to( $n['link'] );
+ }
+ }
+
+ // Assert that notifications for user 2 are cleared and empty.
+ $this->assertEmpty( BP_Notifications_Notification::get( array(
+ 'user_id' => $this->u2,
+ ) ) );
</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>
</div>
</body>
</html>