Changeset 12608

Timestamp:

06/01/2023 02:48:05 AM (3 years ago)

Author:

dd32

Message:

API: Helpscout: Handle both the result of the Conversation API, and that of the payload sent with dynamic widgets.

Add a method to find the human readable mailbox name.

Location:

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout

Files:

• common.php (modified) (8 diffs)
• profile.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php

@@ -104 +104 @@
  */
 function get_user_email_for_email( $request ) {
-        $email   = $request->customer->email ?? false;
-        $subject = $request->ticket->subject ?? '';
-        $user    = get_user_by( 'email', $email );
+        $customer = $request->customer ?? ( $request->primaryCustomer ?? false );
+        $email    = $customer->email ?? false;
+        $subject  = $request->ticket->subject ?? ( $request->subject ?? '' );
+        $user     = get_user_by( 'email', $email );
+        $email_id = $request->ticket->id ?? ( $request->id ?? false );
 
         // If this is related to a slack user, fetch their details instead.
@@ -117 +119 @@
 
         // If the customer object has alternative emails listed, check to see if they have a profile.
-        if ( ! $user && ! empty( $request->customer->emails ) ) {
-                $user = get_user_from_emails( $request->customer->emails );
+        if ( ! $user && ! empty( $customer->emails ) ) {
+                $user = get_user_from_emails( $customer->emails );
         }
 
@@ -127 +129 @@
 
         // Determine if this is a bounce, and if so, find out who for.
-        if ( ! $user && $email && isset( $request->ticket->id ) ) {
-                $from          = strtolower( implode( ' ', array_filter( [ $email, ( $request->customer->fname ?? false ), ( $request->customer->lname ?? false ) ] ) ) );
+        if ( ! $user && $email && $email_id ) {
+                $from          = strtolower( implode( ' ', array_filter( [ $email, ( $customer->fname ?? false ), ( $customer->first ?? false ), ( $customer->lname ?? false ), ( $customer->last ?? false ) ] ) ) );
                 $subject_lower = strtolower( $subject );
 
@@ -146 +148 @@
 
                         // Fetch the email.
-                        $email_obj = get_email_thread( $request->ticket->id ?? 0 );
+                        $email_obj = get_email_thread( $email_id );
                         if ( ! empty( $email_obj->_embedded->threads ) ) {
                                 $attachment_api_urls = [];
@@ -252 +254 @@
  */
 function get_plugin_or_theme_from_email( $request ) {
-        $subject = $request->ticket->subject ?? '';
+        $subject = $request->subject ?? ( $request->ticket->subject ?? '' );
 
         $possible = [
@@ -261 +263 @@
         // Reported themes, shortcut, assume the slug is the title.. since it always is..
         if ( str_starts_with( $subject, 'Reported Theme:' ) ) {
-                $possible['themes'][] = sanitize_title_with_dashes( trim( explode( ':', $request->ticket->subject )[1] ) );
+                $possible['themes'][] = sanitize_title_with_dashes( trim( explode( ':', $subject )[1] ) );
         }
 
@@ -281 +283 @@
 
         // Often a slug is mentioned in the title, so let's try to extract that.
-        if ( preg_match_all( '!(?P<slug>[a-z0-9\-]{10,})!', $subject, $m ) ) {
+        if ( preg_match_all( '!\b(?P<slug>[a-z0-9\-]{10,})!', $subject, $m ) ) {
                 $possible['plugins'] = array_merge( $possible['plugins'], $m['slug'] );
                 $possible['themes']  = array_merge( $possible['themes'],  $m['slug'] );
@@ -392 +394 @@
         return $user;
 }
+
+/**
+ * Find the human-readable name for a mailbox ID.
+ *
+ * @param int|object $mailbox_id_or_request Mailbox ID or request object.
+ */
+function get_mailbox_name( $mailbox_id_or_request ) {
+        $constants = [
+                'data',
+                'jobs',
+                'openverse',
+                'password_resets',
+                'photos',
+                'plugins',
+                'themes',
+        ];
+
+        $mailbox_id = $mailbox_id_or_request->mailboxId ?? $mailbox_id_or_request;
+        if ( ! $mailbox_id || ! is_numeric( $mailbox_id ) ) {
+                return 0;
+        }
+
+        foreach ( $constants as $constant ) {
+                if ( constant( 'HELPSCOUT_' . strtoupper( $constant ) . '_MAILBOXID' ) == $mailbox_id ) {
+                        return $constant;
+                }
+        }
+
+        // Fetch the mailbox..
+        $mailbox = cached_helpscout_get( "/mailboxes/{$mailbox_id}" );
+        if ( ! $mailbox ) {
+                return $mailbox_id;
+        }
+
+        return sanitize_title( $mailbox->name );
+}

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/profile.php

@@ -25 +25 @@
 
                 // When the Displayed account email doesn't match the email being displayed, output the user email address too.
-                if ( ! empty( $request->customer->email ) && $request->customer->email !== $user->user_email ) {
+                if ( ! empty( $request->customer->email ) && strcasecmp( $request->customer->email, $user->user_email ) ) {
                         $html .= '<p>Account Email: ' . esc_html( $user->user_email ) . '</p>';
                 }
@@ -58 +58 @@
                                 esc_url( add_query_arg( 's', urlencode( $u->user_email ), 'https://login.wordpress.org/wp-admin/admin.php?page=user-registrations&s=' ) ),
                                 esc_html( $u->user_login ) . (
-                                        $request->customer->email == $u->user_email ? '' : ' (' . esc_html( $u->user_email ) . ')'
+                                        strcasecmp( $request->customer->email, $u->user_email ) ? ' (' . esc_html( $u->user_email ) . ')' : ''
                                 ),
                                 esc_html( $match_status( $u ) )