Changeset 14061 for trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

Timestamp:

10/28/2024 05:27:43 PM (5 months ago)

Author:

espellcaste

Message:

Improve deleted-user private messages in the web and REST API.

Private messages from a deleted user are properly anonymized in both the web and REST API.

Props imath, niftythree.

Closes ​https://github.com/buddypress/buddypress/pull/384
Fixes #9160

File:

• trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php (modified) (7 diffs)

trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -163 +163 @@
         wp_send_json_error( $response );
     }
+}
+
+/**
+ * Returns recipient's data for the Backbone UI.
+ *
+ * @since 15.0.0
+ *
+ * @param integer $user_id The User ID.
+ * @return array
+ */
+function bp_nouveau_ajax_get_message_recipients_data( $user_id ) {
+    $user_link   = bp_core_get_userlink( $user_id, false, true );
+    $avatar_args = array(
+        'item_id' => $user_id,
+        'object'  => 'user',
+        'type'    => 'thumb',
+        'width'   => 28,
+        'height'  => 28,
+        'html'    => false,
+    );
+
+    if ( ! $user_link ) {
+        return array(
+            'avatar'    => esc_url( bp_core_avatar_default( 'gravatar', $avatar_args ) ),
+            'user_link' => '',
+            'user_name' => '',
+        );
+    }
+
+    return array(
+        'avatar'    => esc_url( bp_core_fetch_avatar( $avatar_args ) ),
+        'user_link' => esc_url( $user_link ),
+        'user_name' => esc_html( bp_core_get_user_displayname( $user_id ) ),
+    );
+}
+
+/**
+ * Returns sender's data for the Backbone UI.
+ *
+ * @since 15.0.0
+ *
+ * @param integer $user_id The User ID.
+ * @return array
+ */
+function bp_nouveau_ajax_get_message_sender_data( $user_id ) {
+    $sender_link = bp_core_get_userlink( $user_id, false, true );
+    $avatar_args = array(
+        'item_id' => $user_id,
+        'object'  => 'user',
+        'type'    => 'thumb',
+        'width'   => 32,
+        'height'  => 32,
+        'html'    => false,
+    );
+
+    if ( ! $sender_link ) {
+        return array(
+            'name'   => esc_html__( 'Deleted User', 'buddypress' ),
+            'link'   => $sender_link,
+            'avatar' => esc_url( bp_core_avatar_default( 'gravatar', $avatar_args ) ),
+        );
+    }
+
+    return array(
+        'name'   => esc_html( bp_core_get_user_displayname( $user_id ) ),
+        'link'   => esc_url( $sender_link ),
+        'avatar' => esc_url( bp_core_fetch_avatar( $avatar_args ) ),
+    );
 }
 
@@ -333 +401 @@
     while ( bp_message_threads() ) : bp_message_thread();
         $last_message_id = (int) $messages_template->thread->last_message_id;
+        $sender_data     = bp_nouveau_ajax_get_message_sender_data( $messages_template->thread->last_sender_id );
 
         $threads->threads[ $i ] = array(
@@ -341 +410 @@
             'content'       => do_shortcode( bp_get_message_thread_content() ),
             'unread'        => bp_message_thread_has_unread(),
-            'sender_name'   => bp_core_get_user_displayname( $messages_template->thread->last_sender_id ),
-            'sender_link'   => bp_core_get_userlink( $messages_template->thread->last_sender_id, false, true ),
-            'sender_avatar' => esc_url( bp_core_fetch_avatar( array(
-                'item_id' => $messages_template->thread->last_sender_id,
-                'object'  => 'user',
-                'type'    => 'thumb',
-                'width'   => 32,
-                'height'  => 32,
-                'html'    => false,
-            ) ) ),
+            'sender_name'   => $sender_data['name'],
+            'sender_link'   => $sender_data['link'],
+            'sender_avatar' => $sender_data['avatar'],
             'count'         => bp_get_message_thread_total_count(),
             'date'          => strtotime( bp_get_message_thread_last_post_date_raw() ) * 1000,
@@ -358 +420 @@
         if ( is_array( $messages_template->thread->recipients ) ) {
             foreach ( $messages_template->thread->recipients as $recipient ) {
-                $threads->threads[ $i ]['recipients'][] = array(
-                    'avatar' => esc_url( bp_core_fetch_avatar( array(
-                        'item_id' => $recipient->user_id,
-                        'object'  => 'user',
-                        'type'    => 'thumb',
-                        'width'   => 28,
-                        'height'  => 28,
-                        'html'    => false,
-                    ) ) ),
-                    'user_link' => bp_core_get_userlink( $recipient->user_id, false, true ),
-                    'user_name' => bp_members_get_user_slug( $recipient->user_id ),
-                );
+                $threads->threads[ $i ]['recipients'][] = bp_nouveau_ajax_get_message_recipients_data( $recipient->user_id );
             }
         }
@@ -421 +472 @@
     $bp->current_action = $reset_action;
 
-    // Return the successfull reply.
+    // Return the successful reply.
     wp_send_json_success( $threads );
 }
@@ -508 +559 @@
         if ( is_array( $thread_template->thread->recipients ) ) {
             foreach ( $thread_template->thread->recipients as $recipient ) {
-                $thread->thread['recipients'][] = array(
-                    'avatar' => esc_url( bp_core_fetch_avatar( array(
-                        'item_id' => $recipient->user_id,
-                        'object'  => 'user',
-                        'type'    => 'thumb',
-                        'width'   => 28,
-                        'height'  => 28,
-                        'html'    => false,
-                    ) ) ),
-                    'user_link' => bp_core_get_userlink( $recipient->user_id, false, true ),
-                    'user_name' => bp_members_get_user_slug( $recipient->user_id ),
-                );
+                $thread->thread['recipients'][] = bp_nouveau_ajax_get_message_recipients_data( $recipient->user_id );
             }
         }
@@ -528 +568 @@
 
     while ( bp_thread_messages() ) : bp_thread_the_message();
+        $sender_data = bp_nouveau_ajax_get_message_sender_data( bp_get_the_thread_message_sender_id() );
+
         $thread->messages[ $i ] = array(
             'id'            => bp_get_the_thread_message_id(),
             'content'       => do_shortcode( bp_get_the_thread_message_content() ),
             'sender_id'     => bp_get_the_thread_message_sender_id(),
-            'sender_name'   => esc_html( bp_get_the_thread_message_sender_name() ),
-            'sender_link'   => bp_get_the_thread_message_sender_link(),
-            'sender_avatar' => esc_url( bp_core_fetch_avatar( array(
-                'item_id' => bp_get_the_thread_message_sender_id(),
-                'object'  => 'user',
-                'type'    => 'thumb',
-                'width'   => 32,
-                'height'  => 32,
-                'html'    => false,
-            ) ) ),
+            'sender_name'   => $sender_data['name'],
+            'sender_link'   => $sender_data['link'],
+            'sender_avatar' => $sender_data['avatar'],
             'date'          => bp_get_the_thread_message_date_sent() * 1000,
             'display_date'  => bp_get_the_thread_message_time_since(),