Ticket #7540: patch7540.diff

src/bp-messages/bp-messages-actions.php

@@ -296 +296 @@
 add_action( 'bp_actions', 'messages_action_delete_message' );
 
 /**
+ * Process a request to quit a conversation (if multi-recipient)
+ *
+ * @return bool False on failure.
+ */
+function messages_action_quit_thread() {
+
+        if ( ! bp_is_messages_component() || bp_is_current_action( 'notices' ) || ! bp_is_action_variable( 'quit', 0 ) ) {              
+                return false;
+        }
+
+        $thread_id = bp_action_variable( 1 );
+        
+        if ( !$thread_id || !is_numeric( $thread_id ) || !messages_check_thread_access( $thread_id ) ) {        
+                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view' ) );
+        } else {
+                if ( ! check_admin_referer( 'messages_quit_thread' ) ) {
+                        return false;
+                }
+                
+                $thread = new BP_Messages_Thread( $thread_id );         
+                //--- only for multi-recipients threads, and not for the creator of the thread
+                if ( count( $thread->recipients ) < 2 or $thread->first_sender_id == bp_loggedin_user_id() ) {  
+                        return false;
+                }
+                if ( !messages_quit_thread( $thread_id, bp_loggedin_user_id() ) ) {
+                        bp_core_add_message( __('There was an error quitting that conversation.', 'buddypress'), 'error' );
+                } else {
+                        bp_core_add_message( __('Conversation quitted.', 'buddypress') );
+                }
+                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/inbox' ) );
+        }
+}
+add_action( 'bp_actions', 'messages_action_quit_thread' );
+
+/**
  * Handle marking a single message thread as read.
  *
  * @since 2.2.0

src/bp-messages/bp-messages-functions.php

@@ -349 +349 @@
 }
 
 /**
+ * Quit a thread.
+ *
+ * Wrapper for {@link BP_Messages_Thread::quit_thread()}.
+ *
+ * @param int $thread_id ID of the thread.
+ *
+ * @return bool.
+ */
+function messages_quit_thread( $thread_id, $user_id = 0 ) {
+        return BP_Messages_Thread::quit_thread( $thread_id, $user_id);
+}
+
+/**
  * Set messages-related cookies.
  *
  * Saves the 'bp_messages_send_to', 'bp_messages_subject', and

src/bp-messages/bp-messages-template.php

@@ -1620 +1620 @@
         }
 
 /**
+ * Get the sender ID of the first message of the thread currently being iterated over.
+ *
+ * @return integer
+*/
+function bp_get_thread_first_sender_id() {
+        global $thread_template;
+        return $thread_template->thread->first_sender_id;
+}
+        
+/**
  * Get a list of thread recipients or a "x recipients" string.
  *
  * In BuddyPress 2.2.0, this parts of this functionality were moved into the
@@ -1996 +2006 @@
                  */
                 return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( bp_displayed_user_domain() . bp_get_messages_slug() . '/inbox/delete/' . bp_get_the_thread_id(), 'messages_delete_thread' ) );
         }
+        
+/**
+ * Output the URL for quitting the current thread.
+ *
+ * @since 
+ */
+function bp_the_quit_thread_link() {
+        echo esc_url( bp_get_the_quit_thread_link() );
+}
+        /**
+         * Get the URL for quitting the current thread.
+         *
+         * @since 
+         *
+         * @return string URL
+         */
+        function bp_get_the_quit_thread_link() {
 
+                /**
+                 * Filters the URL for quitting the current thread.
+                 *
+                 * @since 
+                 *
+                 * @param string $value URL for quitting the current thread.
+                 * @param string $value Text indicating action being executed.
+                 */
+                return apply_filters( 'bp_get_message_quit_thread_link', wp_nonce_url( bp_displayed_user_domain() . bp_get_messages_slug() . '/inbox/quit/' . bp_get_the_thread_id(), 'messages_quit_thread' ) );
+        }       
+        
 /**
  * Output the 'Sent x hours ago' string for the current message.
  *

src/bp-messages/classes/class-bp-messages-thread.php

@@ -96 +96 @@
          * @var int
          */
         public $last_sender_id;
+        
+        /**
+         * The user ID of the author of the first message in this thread.
+         *
+         * @since 1.2.0
+         * @var int
+         */
+        public $first_sender_id;
 
         /**
          * Sort order of the messages in this thread (ASC or DESC).
@@ -164 +172 @@
                 if ( empty( $this->messages ) || is_wp_error( $this->messages ) ) {
                         return false;
                 }
+                
+                $this->first_sender_id       = $this->messages[ 0 ]->sender_id;
 
                 // Flip if order is DESC.
                 if ( 'DESC' === $order ) {
@@ -675 +685 @@
 
                 return $retval;
         }
+        
+        /**
+         * Quite a multi-recipient thread.
+         *
+         * @since 
+         *
+         * @param int $thread_id The message thread ID.
+         *
+         * @return bool.
+         */
+        public static function quit_thread( $thread_id = 0, $user_id = 0 ) {
+
+                if ( empty( $user_id ) ) {
+                        $user_id = bp_loggedin_user_id();
+                }
+                global $wpdb;
+
+                $bp     = buddypress();
+                
+                $retval = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d  AND user_id = %d", $thread_id, $user_id ) );
+                
+                wp_cache_delete( "thread_recipients_{$thread_id}", 'bp_messages' );                     
+                wp_cache_delete( $user_id, 'bp_messages_unread_count' );
+
+                /**
+                 * Fires when messages thread was quitted.
+                 *
+                 * @since 2.8.0
+                 *
+                 * @param int $thread_id The message thread ID.
+                 */
+                do_action( 'messages_thread_quitted', $thread_id, $user_id );
+
+                return $retval;
+        }
 
         /**
          * Returns the total number of message threads for a user.
@@ -904 +949 @@
 
                 return (bool) ! $errors;
         }
+
 }