<!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][14035] trunk: BP REST API: Allow creating messages with non-empty content.</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/14035">14035</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/14035","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-02 04:13:14 +0000 (Wed, 02 Oct 2024)</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'>BP REST API: Allow creating messages with non-empty content.
Make sure it is possible to create messages with non-empty content in the BP REST API. This is a followup from <a href="http://buddypress.trac.wordpress.org/changeset/13986">[13986]</a>.
Props imath and emaralive.
See <a href="http://buddypress.trac.wordpress.org/ticket/9145">#9145</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9175">#9175</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesclassesclassbpmessagesrestcontrollerphp">trunk/src/bp-messages/classes/class-bp-messages-rest-controller.php</a></li>
<li><a href="#trunksrcbpmessagesclassesclassbpmessagesthreadphp">trunk/src/bp-messages/classes/class-bp-messages-thread.php</a></li>
<li><a href="#trunktestsphpunittestcasesmemberstestcontrollerphp">trunk/tests/phpunit/testcases/members/test-controller.php</a></li>
<li><a href="#trunktestsphpunittestcasesmessagestestcontrollerphp">trunk/tests/phpunit/testcases/messages/test-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesclassesclassbpmessagesrestcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/classes/class-bp-messages-rest-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/classes/class-bp-messages-rest-controller.php 2024-10-02 03:23:39 UTC (rev 14034)
+++ trunk/src/bp-messages/classes/class-bp-messages-rest-controller.php 2024-10-02 04:13:14 UTC (rev 14035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,17 +339,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_REST_Response|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function create_item( $request ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $create_args = $this->prepare_item_for_database( $request );
+
+ // Let's return the original error if possible.
+ $create_args->error_type = 'wp_error';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create the message or the reply.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thread_id = messages_new_message( $this->prepare_item_for_database( $request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thread_id = messages_new_message( $create_args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate it created a Thread or was added to it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $thread_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $thread_id instanceof WP_Error ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_rest_messages_create_failed',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'There was an error trying to create the message.', 'buddypress' ),
- array(
- 'status' => 500,
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thread_id->get_error_message(),
+ array( 'status' => 500 )
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,10 +782,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_thread->sender_id = bp_loggedin_user_id();
</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">- if ( ! empty( $schema['properties']['message'] ) && ! empty( $request->get_param( 'message' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $thread->message ) ) {
+ $prepared_thread->message = $thread->message;
+ } elseif ( ! empty( $schema['properties']['message'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared_thread->content = $request->get_param( 'message' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( $thread->message ) ) {
- $prepared_thread->message = $thread->message;
</del><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"> if ( ! empty( $schema['properties']['subject'] ) && ! empty( $request->get_param( 'subject' ) ) ) {
</span></span></pre></div>
<a id="trunksrcbpmessagesclassesclassbpmessagesthreadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/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">--- trunk/src/bp-messages/classes/class-bp-messages-thread.php 2024-10-02 03:23:39 UTC (rev 14034)
+++ trunk/src/bp-messages/classes/class-bp-messages-thread.php 2024-10-02 04:13:14 UTC (rev 14035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $recipients;
</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">+ * The user ID of the sender of the message thread.
+ *
+ * @since 1.2.0
+ * @var int
+ */
+ public $sender_id;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * The user IDs of all messages in the message thread.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 10.0.0 Updated the `$args` with new paremeters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 10.0.0 Updated the `$args` with new parameters.
</ins><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="cx" style="display: block; padding: 0 10px"> * @param string $order The order to sort the messages. Either 'ASC' or 'DESC'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Used in the constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 10.0.0 Updated the `$args` with new paremeters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 10.0.0 Updated the `$args` with new parameters.
</ins><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="cx" style="display: block; padding: 0 10px"> * @param string $order The order to sort the messages. Either 'ASC' or 'DESC'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_id = (int) $thread_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = (int) $user_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = (int) $user_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = bp_loggedin_user_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +740,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pag_sql = $type_sql = $search_sql = $user_id_sql = $sender_sql = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pag_sql = $type_sql = $search_sql = $user_id_sql = $sender_sql = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_query_sql = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'join' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'where' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,18 +747,18 @@
</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"> if ( $r['limit'] && $r['page'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['limit'] ), intval( $r['limit'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pag_sql = $wpdb->prepare( ' LIMIT %d, %d', intval( ( $r['page'] - 1 ) * $r['limit'] ), intval( $r['limit'] ) );
</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"> if ( $r['type'] == 'unread' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type_sql = " AND r.unread_count != 0 ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type_sql = ' AND r.unread_count != 0 ';
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $r['type'] == 'read' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type_sql = " AND r.unread_count = 0 ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type_sql = ' AND r.unread_count = 0 ';
</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"> if ( ! empty( $r['search_terms'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $search_terms_like = '%' . bp_esc_like( $r['search_terms'] ) . '%';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_sql = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s )", $search_terms_like, $search_terms_like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_sql = $wpdb->prepare( 'AND ( subject LIKE %s OR message LIKE %s )', $search_terms_like, $search_terms_like );
</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"> $r['user_id'] = (int) $r['user_id'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up SQL array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = array();
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $sql['where'] = "WHERE {$deleted_sql} {$user_id_sql} {$sender_sql} {$type_sql} {$search_sql} {$meta_query_sql['where']}";
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmemberstestcontrollerphp"></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/members/test-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/members/test-controller.php 2024-10-02 03:23:39 UTC (rev 14034)
+++ trunk/tests/phpunit/testcases/members/test-controller.php 2024-10-02 04:13:14 UTC (rev 14035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_is_user_spammer( $u ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $u2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->bp::set_current_user( $u2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'context', 'view' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_is_user_spammer( $u ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->bp::set_current_user( $u );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'context', 'view' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,7 +610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_is_user_spammer( $u ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_current_user( $this->user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->bp::set_current_user( $this->user );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'context', 'view' );
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmessagestestcontrollerphp"></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/messages/test-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/messages/test-controller.php 2024-10-02 03:23:39 UTC (rev 14034)
+++ trunk/tests/phpunit/testcases/messages/test-controller.php 2024-10-02 04:13:14 UTC (rev 14035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,9 +423,12 @@
</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">+ * @dataProvider provider_create_item_with_empty_content_options
+ *
+ * @ticket BP9175
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group create_item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_create_item_with_no_content() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_item_with_empty_content_options( $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->bp::set_current_user( $this->user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', $this->endpoint_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,10 +437,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_id' => $this->user,
</span><span class="cx" style="display: block; padding: 0 10px"> 'recipients' => array( static::factory()->user->create() ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subject' => 'Foo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subject' => 'A new message',
+ 'message' => $content,
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = $this->server->dispatch( $request );
+
+ $this->assertErrorResponse( 'bp_rest_messages_create_failed', $response, 500 );
+ $this->assertSame( 'Your message was not sent. Please enter some content.', $response->get_data()['message'] );
+ }
+
+ /**
+ * @ticket BP9175
+ * @group create_item
+ */
+ public function test_create_item_with_null_content() {
+ $this->bp::set_current_user( $this->user );
+
+ $request = new WP_REST_Request( 'POST', $this->endpoint_url );
+ $request->set_param( 'context', 'edit' );
+ $request->set_query_params(
+ array(
+ 'sender_id' => $this->user,
+ 'recipients' => array( static::factory()->user->create() ),
+ 'subject' => 'A new message',
+ 'message' => null,
+ )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_missing_callback_param',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->server->dispatch( $request ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,9 +474,12 @@
</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">+ * @dataProvider provider_create_item_irregular_content_options
+ *
+ * @ticket BP9175
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group create_item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_create_item_with_no_receipts() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_create_item_with_irregular_content_options( $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->bp::set_current_user( $this->user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'POST', $this->endpoint_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,6 +486,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'context', 'edit' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_query_params(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sender_id' => $this->user,
+ 'recipients' => array( static::factory()->user->create() ),
+ 'subject' => 'A new message',
+ 'message' => $content,
+ )
+ );
+
+ $response = $this->server->dispatch( $request );
+
+ $this->assertEquals( 200, $response->get_status() );
+ }
+
+ /**
+ * Provider for the test_create_item_with_empty_content_options() test.
+ *
+ * @return array
+ */
+ public function provider_create_item_with_empty_content_options() {
+ return array(
+ array( '' ),
+ array( '' ),
+ array( false ),
+ array( 0 ), // '0' is a valid message content.
+ array( array() ),
+ );
+ }
+
+ /**
+ * Provider for the test_create_item_with_irregular_content_options() test.
+ *
+ * @return array
+ */
+ public function provider_create_item_irregular_content_options() {
+ return array(
+ array( '0' ),
+ array( '00' ),
+ array( 'false' ),
+ );
+ }
+
+ /**
+ * @group create_item
+ */
+ public function test_create_item_with_no_recipients() {
+ $this->bp::set_current_user( $this->user );
+
+ $request = new WP_REST_Request( 'POST', $this->endpoint_url );
+ $request->set_param( 'context', 'edit' );
+ $request->set_query_params(
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sender_id' => $this->user,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subject' => 'Foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => 'Content',
</span></span></pre>
</div>
</div>
</body>
</html>