<!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][8202] trunk: Messages: Reformat new message notifications.</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8202">8202</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-03-29 01:00:36 +0000 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Messages: Reformat new message notifications.
This commit changes the single message notification link to go
directly to the message thread in question and not the message inbox.
When the message thread is viewed, new messages are marked as read.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5479">#5479</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoredeprecated20php">trunk/bp-core/deprecated/2.0.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoredeprecated20php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/2.0.php (8201 => 8202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/2.0.php 2014-03-29 00:40:28 UTC (rev 8201)
+++ trunk/bp-core/deprecated/2.0.php 2014-03-29 01:00:36 UTC (rev 8202)
</span><span class="lines">@@ -23,3 +23,10 @@
</span><span class="cx"> function bp_blogs_catch_published_post() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '2.0', 'bp_blogs_catch_transition_post_status()' );
</span><span class="cx"> }
</span><ins>+
+/**
+ * @deprecated BuddyPress (2.0.0)
+ */
+function bp_messages_screen_inbox_mark_notifications() {
+ _deprecated_function( __FUNCTION__, '2.0', 'bp_messages_screen_conversation_mark_notifications()' );
+}
</ins></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (8201 => 8202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2014-03-29 00:40:28 UTC (rev 8201)
+++ trunk/bp-messages/bp-messages-notifications.php 2014-03-29 01:00:36 UTC (rev 8202)
</span><span class="lines">@@ -120,10 +120,16 @@
</span><span class="cx"> $text = sprintf( __('You have %d new messages', 'buddypress' ), (int) $total_items );
</span><span class="cx"> $filter = 'bp_messages_multiple_new_message_notification';
</span><span class="cx"> } else {
</span><del>- if ( !empty( $secondary_item_id ) ) {
- $text = sprintf( __('You have %d new message from %s', 'buddypress' ), (int) $total_items, bp_core_get_user_displayname( $secondary_item_id ) );
</del><ins>+ // get message thread ID
+ $message = new BP_Messages_Message( $item_id );
+ $thread_id = $message->thread_id;
+
+ $link = bp_get_message_thread_view_link( $thread_id );
+
+ if ( ! empty( $secondary_item_id ) ) {
+ $text = sprintf( __( '%2$s sent you a new private message', 'buddypress' ), bp_core_get_user_displayname( $secondary_item_id ) );
</ins><span class="cx"> } else {
</span><del>- $text = sprintf( __('You have %d new message', 'buddypress' ), (int) $total_items );
</del><ins>+ $text = sprintf( __( 'You have %d new private messages', 'buddypress' ), (int) $total_items );
</ins><span class="cx"> }
</span><span class="cx"> $filter = 'bp_messages_single_new_message_notification';
</span><span class="cx"> }
</span><span class="lines">@@ -167,28 +173,38 @@
</span><span class="cx"> add_action( 'messages_message_sent', 'bp_messages_message_sent_add_notification', 10 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Mark new message notifications when member views their inbox.
- *
- * @since BuddyPress (1.9.0)
- */
-function bp_messages_screen_inbox_mark_notifications() {
- if ( bp_is_active( 'notifications' ) ) {
- bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->messages->id, 'new_message' );
- }
-}
-add_action( 'messages_screen_inbox', 'bp_messages_screen_inbox_mark_notifications', 10 );
-
-/**
</del><span class="cx"> * Mark new message notification when member reads a message thread directly.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.9.0)
</span><span class="cx"> */
</span><span class="cx"> function bp_messages_screen_conversation_mark_notifications() {
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), (int) bp_action_variable( 0 ), buddypress()->messages->id, 'new_message' );
</del><ins>+ global $thread_template;
+
+ // get unread PM notifications for the user
+ $new_pm_notifications = BP_Notifications_Notification::get( array(
+ 'user_id' => bp_loggedin_user_id(),
+ 'component_name' => buddypress()->messages->id,
+ 'component_action' => 'new_message',
+ 'is_new' => 1,
+ ) );
+ $unread_message_ids = wp_list_pluck( $new_pm_notifications, 'item_id' );
+
+ // no unread PMs, so stop!
+ if ( empty( $unread_message_ids ) ) {
+ return;
+ }
+
+ // get the unread message ids for this thread only
+ $message_ids = array_intersect( $unread_message_ids, wp_list_pluck( $thread_template->thread->messages, 'id' ) );
+
+ // mark each notification for each PM message as read
+ foreach ( $message_ids as $message_id ) {
+ bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), (int) $message_id, buddypress()->messages->id, 'new_message' );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'messages_screen_conversation', 'bp_messages_screen_inbox_mark_notifications', 10 );
</del><ins>+add_action( 'thread_loop_start', 'bp_messages_screen_conversation_mark_notifications', 10 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * When a message is deleted, delete corresponding notifications.
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (8201 => 8202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2014-03-29 00:40:28 UTC (rev 8201)
+++ trunk/bp-messages/bp-messages-template.php 2014-03-29 01:00:36 UTC (rev 8202)
</span><span class="lines">@@ -306,12 +306,19 @@
</span><span class="cx"> return apply_filters( 'bp_message_thread_to', BP_Messages_Thread::get_recipient_links($messages_template->thread->recipients ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_message_thread_view_link() {
- echo bp_get_message_thread_view_link();
</del><ins>+function bp_message_thread_view_link( $thread_id = 0 ) {
+ echo bp_get_message_thread_view_link( $thread_id );
</ins><span class="cx"> }
</span><del>- function bp_get_message_thread_view_link() {
- global $messages_template, $bp;
- return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id ) );
</del><ins>+ function bp_get_message_thread_view_link( $thread_id = 0 ) {
+ global $messages_template;
+
+ if ( empty( $messages_template ) && (int) $thread_id > 0 ) {
+ $thread_id = (int) $thread_id;
+ } else {
+ $thread_id = $messages_template->thread->thread_id;
+ }
+
+ return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . buddypress()->messages->slug . '/view/' . $thread_id ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_message_thread_delete_link() {
</span></span></pre>
</div>
</div>
</body>
</html>