Changeset 12297

Timestamp:

12/05/2022 03:58:29 AM (3 years ago)

Author:

dd32

Message:

HelpScout: Match a few other email bounce variants.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php (modified) (3 diffs)

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

@@ -43 +43 @@
         $from          = strtolower( implode( ' ', array_filter( [ $email, ( $request->customer->fname ?? false ), ( $request->customer->lname ?? false ) ] ) ) );
         $subject_lower = strtolower( $subject );
+
         if (
             str_contains( $from, 'mail delivery' ) ||
             str_contains( $from, 'postmaster' ) ||
             str_contains( $from, 'mailer-daemon' ) ||
+            str_contains( $from, 'noreply' ) ||
             str_contains( $subject_lower, 'undelivered mail' ) ||
             str_contains( $subject_lower, 'returned mail' ) ||
@@ -52 +54 @@
             str_contains( $subject_lower, 'delivery status' ) ||
             str_contains( $subject_lower, 'delivery report' ) ||
-            str_contains( $subject_lower, 'mail delivery failed' )
+            str_contains( $subject_lower, 'mail delivery failed' ) ||
+            str_contains( $subject_lower, 'mail delivery failure' )
         ) {
+
+
             // Fetch the email.
             $email_obj = Helpscout_API::api( '/v2/conversations/' . $request->ticket->id . '?embed=threads' );
@@ -67 +72 @@
                     // Extract `To:`, `X-Orig-To:`, and fallback to all emails.
                     $emails = [];
-                    if ( preg_match( '!^(x-orig-to:|to:)\s*(.+@.+)$!im', $email_body, $m ) ) {
-                        $m[2] = str_replace( [ '<', '>' ], '', $m[2] );
-                        $m[2] = trim( $m[2], '<> ' );
+                    if ( preg_match( '!^(x-orig-to:|to:|Final-Recipient:(\s*rfc\d+;)?)\s*(?P<email>.+@.+)$!im', $email_body, $m ) ) {
+                        $m['email'] = str_replace( [ '&lt;', '&gt;' ], '', $m['email'] );
+                        $m['email'] = trim( $m['email'], '<> ' );
 
-                        $emails = [ $m[2] ];
+                        $emails = [ $m['email'] ];
                     } else {
                         // Ugly regex for emails, but it's good for mailer-daemon emails.