Changeset 14061 for trunk/src/bp-messages/bp-messages-template.php

Timestamp:

10/28/2024 05:27:43 PM (18 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-messages/bp-messages-template.php (modified) (10 diffs)

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

@@ -199 +199 @@
         global $messages_template;
 
+        $last_user_id = $messages_template->thread->last_sender_id;
+        $user         = get_userdata( (int) $last_user_id );
+
+        if ( 'sentbox' !== bp_current_action() && ( empty( $user ) || ! $user->exists() ) ) {
+            $thread_excerpt = esc_html__( '[deleted]', 'buddypress' );
+        } else {
+            $thread_excerpt = wp_strip_all_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 75 ) );
+        }
+
         /**
          * Filters the excerpt of the current thread in the loop.
@@ -204 +213 @@
          * @since 1.0.0
          *
-         * @param string $value Excerpt of the current thread in the loop.
-         */
-        return apply_filters( 'bp_get_message_thread_excerpt', wp_strip_all_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 75 ) ) );
+         * @param string $thread_excerpt Excerpt of the current thread in the loop.
+         */
+        return apply_filters( 'bp_get_message_thread_excerpt', $thread_excerpt );
     }
 
@@ -243 +252 @@
         global $messages_template;
 
+        $last_user_id = $messages_template->thread->last_sender_id;
+        $user         = get_userdata( (int) $last_user_id );
+
+        if ( ( empty( $user ) || ! $user->exists() ) ) {
+            $last_message_content = esc_html__( '[deleted]', 'buddypress' );
+        } else {
+            $last_message_content = $messages_template->thread->last_message_content;
+        }
+
         /**
          * Filters the content of the last message in the thread.
@@ -250 +268 @@
          * @param string $last_message_content Content of the last message in the thread.
          */
-        return apply_filters( 'bp_get_message_thread_content', $messages_template->thread->last_message_content );
+        return apply_filters( 'bp_get_message_thread_content', $last_message_content );
     }
 
@@ -257 +275 @@
  */
 function bp_message_thread_from() {
-    // Esaping is made in `bp_core_get_userlink()` && in `bp_core_get_user_displayname()`.
+    // Escaping is made in `bp_core_get_userlink()` && in `bp_core_get_user_displayname()`.
     // phpcs:ignore WordPress.Security.EscapeOutput
     echo bp_get_message_thread_from();
@@ -271 +289 @@
         global $messages_template;
 
+        $userlink = bp_core_get_userlink( $messages_template->thread->last_sender_id );
+
+        if ( empty( $userlink ) ) {
+            $userlink = esc_html__( 'Deleted User', 'buddypress' );
+        }
+
         /**
          * Filters the link to the page of the current thread's last author.
@@ -276 +300 @@
          * @since 1.0.0
          *
-         * @param string $value Link to the page of the current thread's last author.
-         */
-        return apply_filters( 'bp_get_message_thread_from', bp_core_get_userlink( $messages_template->thread->last_sender_id ) );
+         * @param string $userlink Link to the page of the current thread's last author.
+         */
+        return apply_filters( 'bp_get_message_thread_from', $userlink );
     }
 
@@ -304 +328 @@
          * @since 1.0.0
          *
-         * @param string $value HTML links to the pages of the current thread's recipients.
+         * @param string $recipients_links HTML links to the pages of the current thread's recipients.
          */
         return apply_filters( 'bp_message_thread_to', BP_Messages_Thread::get_recipient_links( $messages_template->thread->recipients ) );
@@ -2234 +2258 @@
         global $thread_template;
 
+        $sender_link = bp_core_get_userlink( $thread_template->message->sender_id, false, true );
+
+        if ( empty( $sender_link ) ) {
+            $sender_link = '';
+        }
+
         /**
          * Filters the link to the sender of the current message.
@@ -2239 +2269 @@
          * @since 1.1.0
          *
-         * @param string $value Link to the sender of the current message.
-         */
-        return apply_filters( 'bp_get_the_thread_message_sender_link', bp_core_get_userlink( $thread_template->message->sender_id, false, true ) );
+         * @param string $sender_link Link to the sender of the current message.
+         */
+        return apply_filters( 'bp_get_the_thread_message_sender_link', $sender_link );
     }