Changeset 12997

Timestamp:

12/04/2023 02:47:09 AM (10 months ago)

Author:

dd32

Message:

Helpscout: Match plugin emails when they're responses to translated emails, or using markedup hypens such as ndash.

File:

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

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

@@ -266 +266 @@
  */
 function get_plugin_or_theme_from_email( $request, $validate_slugs = false ) {
-    $subject  = $request->subject ?? ( $request->ticket->subject ?? '' );
-    $email_id = $request->id      ?? ( $request->ticket->id      ?? 0 );
+    $subject    = $request->subject   ?? ( $request->ticket->subject ?? '' );
+    $email_id   = $request->id        ?? ( $request->ticket->id      ?? 0 );
+    $mailbox_id = $request->mailboxId ?? ( $request->mailbox->id     ?? 0 );
 
     $possible = [
@@ -281 +282 @@
     /*
      * Plugin reviews, match the format of either:
+     *
      * "[WordPress Plugin Directory] {Type Of Email}: {Plugin Title}"
      * "[WordPress Plugin Directory] {Type Of Email} - {Plugin Title}"
+     * "[Translated WordPress Plugin Directory] {Translated Type} - {Plugin Title}
+     *
+     * Because of translations, we can't be sure of the exact wording, so we'll just hope that it matches the general format.
+     * NOTE: \p{Pd} is Regex for a dash-like character, which includes hyphens and ndashes.
      */
     if (
-        preg_match( '!\[WordPress Plugin Directory\][^:]+: (?P<title>.+)$!i', $subject, $m ) ||
-        preg_match( '!\[WordPress Plugin Directory\].+? - (?P<title>.+)$!i', $subject, $m )
+        (
+            'plugins' === get_mailbox_name( $mailbox_id ) &&
+            (
+                preg_match( '!\[[^]]+\][^:]+: (?P<title>.+)$!i', $subject, $m ) ||
+                preg_match( '!\[[^]]+\].+? \p{Pd} (?P<title>.+)$!iu', $subject, $m )
+            )
+        ) || (
+            // Same as above, but in non-plugins mailboxes using the English strings only.
+            preg_match( '!\[WordPress Plugin Directory\][^:]+: (?P<title>.+)$!i', $subject, $m ) ||
+            preg_match( '!\[WordPress Plugin Directory\].+? \p{Pd} (?P<title>.+)$!iu', $subject, $m )
+        )
     ) {
         switch_to_blog( WPORG_PLUGIN_DIRECTORY_BLOGID );