<!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][8099] trunk: When a message is deleted, delete corresponding 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/8099">8099</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-09 19:46:01 +0000 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When a message is deleted, delete corresponding notifications
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5289">#5289</a>
Props imath, henrywright</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesclassesphp">trunk/bp-messages/bp-messages-classes.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-notifications.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestcasesmessagesnotificationsphp">trunk/tests/testcases/messages/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-classes.php (8098 => 8099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-classes.php 2014-03-09 19:43:03 UTC (rev 8098)
+++ trunk/bp-messages/bp-messages-classes.php 2014-03-09 19:46:01 UTC (rev 8099)
</span><span class="lines">@@ -212,6 +212,9 @@
</span><span class="cx"> // Mark messages as deleted
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET is_deleted = 1 WHERE thread_id = %d AND user_id = %d", $thread_id, bp_loggedin_user_id() ) );
</span><span class="cx">
</span><ins>+ // Get the message id in order to pass to the action
+ $message_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
+
</ins><span class="cx"> // Check to see if any more recipients remain for this message
</span><span class="cx"> // if not, then delete the message from the database.
</span><span class="cx"> $recipients = $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d AND is_deleted = 0", $thread_id ) );
</span><span class="lines">@@ -224,6 +227,8 @@
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ do_action( 'messages_thread_deleted_thread', $message_id );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (8098 => 8099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2014-03-09 19:43:03 UTC (rev 8098)
+++ trunk/bp-messages/bp-messages-notifications.php 2014-03-09 19:46:01 UTC (rev 8099)
</span><span class="lines">@@ -189,3 +189,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'messages_screen_conversation', 'bp_messages_screen_inbox_mark_notifications', 10 );
</span><ins>+
+/**
+ * When a message is deleted, delete corresponding notifications.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $message_id ID of the message.
+ */
+function bp_messages_message_delete_notifications( $message_id = 0 ) {
+ if ( bp_is_active( 'notifications' ) && ! empty( $message_id ) ) {
+ bp_notifications_delete_notifications_by_item_id( bp_loggedin_user_id(), (int) $message_id, buddypress()->messages->id, 'new_message' );
+ }
+}
+add_action( 'messages_thread_deleted_thread', 'bp_messages_message_delete_notifications', 10, 1 );
</ins></span></pre></div>
<a id="trunkteststestcasesmessagesnotificationsphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/messages/notifications.php (0 => 8099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/messages/notifications.php (rev 0)
+++ trunk/tests/testcases/messages/notifications.php 2014-03-09 19:46:01 UTC (rev 8099)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<?php
+
+/**
+ * @group notifications
+ * @group messages
+ */
+class BP_Tests_Messages_Notifications extends BP_UnitTestCase {
+ /**
+ * @group bp_messages_message_delete_notifications
+ */
+ public function test_bp_messages_message_delete_notifications() {
+ $current_user = get_current_user_id();
+ $u = $this->create_user();
+ $this->set_current_user( $u );
+
+ // Dummy thread ID
+ $t = 12;
+
+ // Admin
+ $n = $this->factory->notification->create( array(
+ 'component_name' => 'messages',
+ 'user_id' => $u,
+ 'item_id' => $t,
+ 'component_action' => 'new_message',
+ ) );
+
+ $notifications = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ ) );
+
+ // Double check it's there
+ $this->assertEquals( array( $n ), wp_list_pluck( $notifications, 'id' ) );
+
+ // fire the hook
+ do_action( 'messages_thread_deleted_thread', $t );
+
+ $notifications = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ ) );
+
+ $this->assertEmpty( $notifications );
+
+ $this->set_current_user( $current_user );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>