<!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][9950] branches/2.3: Messages: Modify message thread queries to exclude messages in deleted threads from "Starred" messages.</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" 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/9950">9950</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/9950","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-16 22:58:07 +0000 (Tue, 16 Jun 2015)</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'>Messages: Modify message thread queries to exclude messages in deleted threads from "Starred" messages.

This change ensures that deleted messages do not appear in the "Starred" section of a member's private messages. Previously, it was possible to delete a private message thread, and still have it come back to life in the "Starred" messages section.

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6483">#6483</a>. Props r-a-y. (2.3 branch, for 2.3.2)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches23srcbpmessagesbpmessagesstarphp">branches/2.3/src/bp-messages/bp-messages-star.php</a></li>
<li><a href="#branches23srcbpmessagesclassesclassbpmessagesthreadphp">branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php</a></li>
<li><a href="#branches23testsphpunittestcasesmessagesstarphp">branches/2.3/tests/phpunit/testcases/messages/star.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches23srcbpmessagesbpmessagesstarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-messages/bp-messages-star.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-messages/bp-messages-star.php 2015-06-16 22:50:15 UTC (rev 9949)
+++ branches/2.3/src/bp-messages/bp-messages-star.php   2015-06-16 22:58:07 UTC (rev 9950)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,10 +350,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @return array
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_messages_filter_starred_message_threads( $r = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $r['user_id'] = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r['box'] = 'starred';
</ins><span class="cx" style="display: block; padding: 0 10px">         $r['meta_query'] = array( array(
</span><span class="cx" style="display: block; padding: 0 10px">                'key'   => 'starred_by_user',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'value' => bp_loggedin_user_id()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'value' => $r['user_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">        return $r;
</span></span></pre></div>
<a id="branches23srcbpmessagesclassesclassbpmessagesthreadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php 2015-06-16 22:50:15 UTC (rev 9949)
+++ branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php   2015-06-16 22:58:07 UTC (rev 9950)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,6 +455,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $r['user_id'] = (int) $r['user_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Default deleted SQL
+               $deleted_sql = 'r.is_deleted = 0';
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 switch ( $r['box'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'sentbox' :
</span><span class="cx" style="display: block; padding: 0 10px">                                $user_id_sql = 'AND ' . $wpdb->prepare( 'm.sender_id = %d', $r['user_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,10 +465,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'inbox' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        default :
</del><span class="cx" style="display: block; padding: 0 10px">                                 $user_id_sql = 'AND ' . $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">                                $sender_sql  = 'AND r.sender_only = 0';
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       // Omit user-deleted threads from all other custom message boxes
+                       default :
+                               $deleted_sql = $wpdb->prepare( '( r.user_id = %d AND r.is_deleted = 0 )', $r['user_id'] );
+                               break;
</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">                // Process meta query into SQL
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,7 +490,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $sql = array();
</span><span class="cx" style="display: block; padding: 0 10px">                $sql['select'] = 'SELECT m.thread_id, MAX(m.date_sent) AS date_sent';
</span><span class="cx" style="display: block; padding: 0 10px">                $sql['from']   = "FROM {$bp->messages->table_name_recipients} r INNER JOIN {$bp->messages->table_name_messages} m ON m.thread_id = r.thread_id {$meta_query_sql['join']}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $sql['where']  = "WHERE r.is_deleted = 0 {$user_id_sql} {$sender_sql} {$type_sql} {$search_sql} {$meta_query_sql['where']}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $sql['where']  = "WHERE {$deleted_sql} {$user_id_sql} {$sender_sql} {$type_sql} {$search_sql} {$meta_query_sql['where']}";
</ins><span class="cx" style="display: block; padding: 0 10px">                 $sql['misc']   = "GROUP BY m.thread_id ORDER BY date_sent DESC {$pag_sql}";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // get thread IDs
</span></span></pre></div>
<a id="branches23testsphpunittestcasesmessagesstarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/tests/phpunit/testcases/messages/star.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/tests/phpunit/testcases/messages/star.php    2015-06-16 22:50:15 UTC (rev 9949)
+++ branches/2.3/tests/phpunit/testcases/messages/star.php      2015-06-16 22:58:07 UTC (rev 9950)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +107,68 @@
</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">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @group bp_messages_filter_starred_message_threads
+        */
+       public function test_get_starred_threads_should_not_include_deleted_thread() {
+               $old_current_user = get_current_user_id();
+               $u1 = $this->factory->user->create();
+               $u2 = $this->factory->user->create();
+
+               // create three threads
+               $t1 = $this->factory->message->create( array(
+                       'sender_id'  => $u1,
+                       'recipients' => array( $u2 ),
+                       'subject'    => 'A',
+               ) );
+               $t2 = $this->factory->message->create( array(
+                       'sender_id'  => $u1,
+                       'recipients' => array( $u2 ),
+                       'subject'    => 'B',
+               ) );
+               $t3 = $this->factory->message->create( array(
+                       'sender_id'  => $u1,
+                       'recipients' => array( $u2 ),
+                       'subject'    => 'C',
+               ) );
+
+               // grab the message ids as individual variables
+               list( $m1 ) = $this->get_message_ids( $t1 );
+               list( $m2 ) = $this->get_message_ids( $t2 );
+               list( $m3 ) = $this->get_message_ids( $t3 );
+
+               // star all threads
+               bp_messages_star_set_action( array(
+                       'user_id'    => $u2,
+                       'message_id' => $m1,
+               ) );
+               bp_messages_star_set_action( array(
+                       'user_id'    => $u2,
+                       'message_id' => $m2,
+               ) );
+               bp_messages_star_set_action( array(
+                       'user_id'    => $u2,
+                       'message_id' => $m3,
+               ) );
+
+               // delete the second thread
+               $this->set_current_user( $u2 );
+               messages_delete_thread( $t2 );
+
+               // load the starred threads loop
+               global $messages_template;
+               add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
+               bp_has_message_threads();
+               remove_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
+
+               // assert that second thread isn't in starred thread loop
+               $thread_ids = wp_list_pluck( $messages_template->threads, 'thread_id' );
+               $this->assertFalse( in_array( $t2, $thread_ids ) );
+
+               // reset
+               $this->set_current_user( $old_current_user );
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Helper method to grab the message IDs from a message thread.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $thread_id The message thread ID
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,4 +178,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $thread = new BP_Messages_Thread( $thread_id );
</span><span class="cx" style="display: block; padding: 0 10px">                return wp_list_pluck( $thread->messages, 'id' );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre>
</div>
</div>

</body>
</html>