Changeset 12464

Timestamp:

03/13/2023 06:19:16 AM (4 years ago)

Author:

dd32

Message:

Helpscout: When an email comes into plugins@ or themes@ and the email author doesn't have any plugins/themes, see if they've mentioned one and link to that instead.

Location:

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

Files:

• common.php (modified) (1 diff)
• plugins-themes.php (modified) (5 diffs)

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

@@ -108 +108 @@
 }
 
+function get_plugin_or_theme_from_email( $request ) {
+        $subject = $request->ticket->subject ?? '';
+
+        $possible = [
+                'themes' => [],
+                'plugins' => []
+        ];
+
+        // Fetch the email.
+        $email_obj = Helpscout_API::api( '/v2/conversations/' . $request->ticket->id . '?embed=threads' );
+        if ( ! empty( $email_obj->_embedded->threads ) ) {
+                foreach ( $email_obj->_embedded->threads as $thread ) {
+                        if ( 'customer' !== $thread->type ) {
+                                continue;
+                        }
+
+                        // Extract matches from the email.
+                        $email_body = strip_tags( str_replace( '<br>', "\n", $thread->body ) );
+
+                        if ( ! preg_match_all( '!/(?<type>plugins|themes)/(?P<slug>[a-z0-9-]+)/?!im', $email_body, $m ) ) {
+                                preg_match_all( '!(?P<type>Plugin|Theme):\s*(?P<slug>[a-z0-9-]+)$!im', $email_body, $m );
+                        }
+
+                        if ( $m ) {
+                                foreach ( $m[0] as $i => $match ) {
+                                        $type = strtolower( $m['type'][ $i ] );
+                                        $slug = strtolower( $m['slug'][ $i ] );
+                                        $possible[ $type ][] = $slug;
+                                }
+                        }
+                }
+        }
+
+        return $possible;
+}
+
 // HelpScout sends json data in the POST, so grab it from the input directly.
 $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.php

@@ -12 +12 @@
 $user  = get_user_by( 'email', $email );
 
-if ( ! $user ) {
-        echo json_encode( array( 'html' => $html ) );
-        die();
-}
-
 foreach ( [
         /* site_id => [ textual singular, post_type ] */
@@ -24 +19 @@
         list( $type, $post_type ) = $details;
 
+        $is_this_inbox = ( "{$type}s@wordpress.org" === $request->mailbox->email );
+
         switch_to_blog( $site_id );
 
         $slugs = [];
-        if ( 'plugin' === $type ) {
+
+        if ( 'plugin' === $type && $user ) {
                 // Committer to a plugin.
-                $slugs = $wpdb->get_col( $wpdb->prepare( 'SELECT path FROM `' . PLUGINS_TABLE_PREFIX . 'svn_access' . '` WHERE user = %s', $user->user_login ) );
-                $slugs = array_filter( array_map( function( $slug ) {
-                        return ltrim( $slug, '/' ) ?: false;
-                }, $slugs ) );
+                $committer_plugins = $wpdb->get_col( $wpdb->prepare( 'SELECT path FROM `' . PLUGINS_TABLE_PREFIX . 'svn_access' . '` WHERE user = %s', $user->user_login ) );
+                array_map(
+                        function( $slug ) use( $slugs ) {
+                                $slug = ltrim( $slug, '/' );
+                                if ( $slug ) {
+                                        $slugs[] = $slug;
+                                }
+                        },
+                        $committer_plugins
+                );
 
                 // TODO: Would be nice to pull for support reps too, but that's less common.
@@ -45 +49 @@
         }
 
-        $slugs    = $slugs ? '"' . implode( '", "', array_map( 'esc_sql', $slugs ) ) . '"' : '';
-        $or_slugs = $slugs ? "OR post_name IN( {$slugs} )" : '';
+        $lookup_by_user = $user ? $user->ID : false;
+        $counts         = false;
+        $sources        = [
+                'by_email_author'
+        ];
+        if ( $is_this_inbox ) {
+                $sources[] = 'check_email';
+        }
+        foreach ( $sources as $source ) {
+                if ( 'check_email' === $source ) {
+                        // Check the email for a plugin/theme name.
+                        $mentioned = get_plugin_or_theme_from_email( $request );
+                        if ( empty( $mentioned[ "{$type}s"] ) ) {
+                                break;
+                        }
 
-        $counts = $wpdb->get_results( $wpdb->prepare(
-                "SELECT post_status, COUNT(*) as count, group_concat( ID ORDER BY post_title ) as ids, group_concat( post_title ORDER BY post_title SEPARATOR ', ' ) as titles
-                FROM $wpdb->posts
-                WHERE post_type = %s AND ( post_author = %s {$or_slugs} )
-                GROUP BY post_status
-                ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' )",
-                $post_type,
-                $user->ID
-        ) );
+                        $lookup_by_user = false;
+                        $slugs          = $mentioned[ "{$type}s" ];
+                }
+
+                $slugs       = $slugs          ? '"' . implode( '", "', array_map( 'esc_sql', array_unique( $slugs ) ) ) . '"' : '';
+                $or_slugs    = $slugs          ? "post_name IN( {$slugs} )" : '';
+                $post_author = $lookup_by_user ? $wpdb->prepare( "post_author = %s", $lookup_by_user ) : '';
+
+                $where = implode( ' OR ', array_filter( [ $post_author, $or_slugs ] ) );
+
+                if ( ! $where ) {
+                        continue;
+                }
+
+                $counts = $wpdb->get_results( $wpdb->prepare(
+                        "SELECT post_status, COUNT(*) as count, group_concat( ID ORDER BY post_title ) as ids, group_concat( post_title ORDER BY post_title SEPARATOR ', ' ) as titles
+                        FROM $wpdb->posts
+                        WHERE post_type = %s AND ( {$where} )
+                        GROUP BY post_status
+                        ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' )",
+                        $post_type,
+                ) );
+
+                if ( $counts && 'check_email' === $source ) {
+                        $html .= '<p><strong>Note: ' . ucwords( $type ) . ' may not be authored the email author.</strong><p>';
+                }
+
+                if ( $counts ) {
+                        break;
+                }
+        }
 
         if ( $counts ) {
@@ -73 +112 @@
                 $html .= sprintf(
                         '<p><a href="%s" title="%s">%s</a></p>',
-                        add_query_arg( [ 'post_type' => $post_type, 'author' => $user->ID ], admin_url( 'edit.php' ) ),
+                        add_query_arg( [ 'post_type' => $post_type, 'author' => $user->ID ?? '' ], admin_url( 'edit.php' ) ),
                         esc_attr( $post_statii ),
                         ucwords( _n( "$total $type", "{$total} {$type}s", $total ) ) // Real bad internationalisation where internationalisation will never be used.
@@ -79 +118 @@
 
                 // plugins@ and themes@ - expand and provide direct links.
-                if ( "{$type}s@wordpress.org" === $request->mailbox->email ) {
+                if ( $is_this_inbox ) {
                         $html .= '<ul>';
                         foreach ( $ids as $post_id ) {