Changeset 13650

Timestamp:

05/02/2024 07:05:00 AM (7 months ago)

Author:

dd32

Message:

Plugin Directory: Centralise the Helpscout email table query code.

See #7385.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/metabox/class-helpscout.php (modified) (2 diffs)
• api/routes/class-plugin-review.php (modified) (3 diffs)
• class-tools.php (modified) (1 diff)
• shortcodes/class-upload-handler.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-helpscout.php

@@ -15 +15 @@
 class HelpScout {
     public static function display() {
-        global $wpdb;
         $post = get_post();
 
-        // Trim off the rejected prefix/suffix.
-        $slug   = preg_replace( '/(^rejected-|-rejected(-\d)?$)/i', '', $post->post_name );
-
         // If the slug is not set, we can't query HelpScout.
-        if ( ! $post->post_name || ! $slug ) {
+        if ( ! $post->post_name ) {
             echo 'Invalid Slug, cannot query emails.';
             return;
         }
 
-        $emails = $wpdb->get_results( $wpdb->prepare(
-            "SELECT emails.*
-                FROM %i emails
-                    JOIN %i meta ON emails.id = meta.helpscout_id
-                WHERE meta.meta_key = 'plugins' AND meta.meta_value IN( %s, %s )
-                ORDER BY `created` DESC",
-            "{$wpdb->base_prefix}helpscout",
-            "{$wpdb->base_prefix}helpscout_meta",
-            $slug,
-            $post->post_name
-        ) );
+        $emails = Tools::get_helpscout_emails( $post );
 
         echo '<table class="widefat striped helpscout-emails">';
@@ -65 +51 @@
                 sprintf(
                     '<a href="%s" title="%s">%s</a>',
-                    esc_url( 'https://secure.helpscout.net/conversation/' . $email->id . '/' . $email->number ),
+                    esc_url( $email->url ),
                     esc_attr( $email->preview ),
                     esc_html( $subject )

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-review.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\API\Routes;
-use WordPressdotorg\Plugin_Directory\Shortcodes\Upload_Handler;
 use WordPressdotorg\Plugin_Directory\API\Base;
 use WordPressdotorg\Plugin_Directory\Template;
+use WordPressdotorg\Plugin_Directory\Tools;
 use WP_Error;
 use WP_REST_Server;
@@ -91 +91 @@
             'post_status'   => $post->post_status,
             'edit_url'      => add_query_arg( [ 'action' => 'edit', 'post' => $post->ID ], admin_url( 'post.php' ) ),
-            'helpscout'     => null, // Link to Review email (or most recent open email)
+            'helpscout'     => null, // Most recent email details.
             'submitter'     => [
                 'user_login' => $submitter->user_login,
@@ -106 +106 @@
             $details['download_link'] = null;
             $details['preview_link']  = null;
+            $details['helpscout']     = Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
+        } else {
+            $details['helpscout']     = Tools::get_helpscout_emails( $post, [ 'limit' => 1 ] );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php

@@ -678 +678 @@
         return 200 === wp_remote_retrieve_response_code( $request );
     }
+
+    /**
+     * Fetch the list of known Helpscout emails for a given post.
+     *
+     * @param \WP_Post $post The post to fetch emails for.
+     * @return array
+     */
+    public static function get_helpscout_emails( $post, $filters = [] ) {
+        global $wpdb;
+
+        $limit = 999;
+        if ( isset( $filters['limit'] ) ) {
+            $limit = absint( $filters['limit'] );
+            unset( $filters['limit'] );
+        }
+
+        // Trim off the rejected prefix/suffix.
+        $slug   = preg_replace( '/(^rejected-|-rejected(-\d)?$)/i', '', $post->post_name );
+        $wheres = '';
+
+        foreach ( $filters as $key => $value ) { 
+            $wheres .= $wpdb->prepare( 'AND emails.%i LIKE %s ', $key, '%' . $value . '%' );
+        }
+
+        $emails = $wpdb->get_results( $wpdb->prepare(
+            "SELECT emails.*
+                FROM %i emails
+                    JOIN %i meta ON emails.id = meta.helpscout_id
+                WHERE meta.meta_key = 'plugins' AND meta.meta_value IN( %s, %s )
+                    $wheres
+                ORDER BY `created` DESC
+                LIMIT %d",
+            "{$wpdb->base_prefix}helpscout",
+            "{$wpdb->base_prefix}helpscout_meta",
+            $slug,
+            $post->post_name,
+            $limit
+        ) );
+
+        foreach ( $emails as &$email ) {
+            $email->url = 'https://secure.helpscout.net/conversation/' . $email->id . '/' . $email->number;
+        }
+
+        if ( 1 === $limit ) {
+            return reset( $emails );
+        }
+
+        return $emails;
+    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -738 +738 @@
      */
     public static function find_review_email( $post ) {
-        global $wpdb;
-
         if ( ! in_array( $post->post_status, [ 'new', 'pending' ] ) || ! $post->post_name ) {
             return false;
         }
 
-        // Find the latest email for this plugin that looks like a review email.
-        return $wpdb->get_row( $wpdb->prepare(
-            "SELECT emails.*
-                FROM %i emails
-                    JOIN %i meta ON emails.id = meta.helpscout_id
-                WHERE meta.meta_key = 'plugins' AND meta.meta_value = %s
-                    AND emails.subject LIKE %s
-                ORDER BY `created` DESC
-                LIMIT 1",
-            "{$wpdb->base_prefix}helpscout",
-            "{$wpdb->base_prefix}helpscout_meta",
-            $post->post_name,
-            '%Review in Progress:%' // The subject line of the review email.
-        ) );
+        return Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
     }