Changeset 11824

Timestamp:

05/10/2022 04:09:33 AM (3 years ago)

Author:

dd32

Message:

Helpscout: Update the list of phrases/terms that we consider to be a returned-mail.

See [11823].

File:

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

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

@@ -39 +39 @@
     // Determine if this is a bounce, and if so, find out who for.
     if ( ! $user && $email && isset( $request->ticket->id ) ) {
-        $from = strtolower( $email . ' ' . ( $request->customer->fname ?? '' ) . ' ' . $request->customers->lname );
+        $from          = strtolower( $email . ' ' . ( $request->customer->fname ?? '' ) . ' ' . $request->customers->lname );
+        $subject_lower = strtolower( $subject );
         if (
             str_contains( $from, 'mail delivery' ) ||
             str_contains( $from, 'postmaster' ) ||
-            str_contains( strtolower( $subject ), 'undelivered mail' ) ||
-            str_contains( strtolower( $subject ), 'returned to sender')
+            str_contains( $from, 'mailer-daemon' ) ||
+            str_contains( $subject_lower, 'undelivered mail' ) ||
+            str_contains( $subject_lower, 'returned mail' ) ||
+            str_contains( $subject_lower, 'returned to sender' ) ||
+            str_contains( $subject_lower, 'delivery status' ) ||
+            str_contains( $subject_lower, 'delivery report' ) ||
+            str_contains( $subject_lower, 'mail delivery failed' )
         ) {
             // Fetch the email.