Changeset 14664

Timestamp:

02/20/2026 04:54:33 AM (6 months ago)

Author:

dd32

Message:

Plugin Directory: Helpscout: Attempt to keep the helpscout conversation linked to the post when the slug changes during review.

Location:

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

Files:

• admin/class-customizations.php (modified) (2 diffs)
• admin/metabox/class-helpscout.php (deleted)
• api/routes/class-plugin-review.php (modified) (2 diffs)
• class-plugin-directory.php (modified) (2 diffs)
• shortcodes/class-upload-handler.php (modified) (3 diffs)
• tools/class-helpscout.php (added)

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

@@ -5 +5 @@
 use \WordPressdotorg\Plugin_Directory\Tools;
 use \WordPressdotorg\Plugin_Directory\Tools\SVN;
+use \WordPressdotorg\Plugin_Directory\Tools\Helpscout;
 use \WordPressdotorg\Plugin_Directory\Template;
 use \WordPressdotorg\Plugin_Directory\Readme\Validator;
@@ -743 +744 @@
                         'emailsdiv',
                         __( 'Emails', 'wporg-plugins' ),
-                        array( __NAMESPACE__ . '\Metabox\Helpscout', 'display' ),
+                        array( Helpscout::class, 'admin_metabox_display' ),
                         'plugin', 'normal', 'high'
                 );

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

@@ -3 +3 @@
 use WordPressdotorg\Plugin_Directory\API\Base;
 use WordPressdotorg\Plugin_Directory\Template;
-use WordPressdotorg\Plugin_Directory\Tools;
+use WordPressdotorg\Plugin_Directory\Tools\Helpscout;
 use WP_Error;
 use WP_REST_Server;
@@ -106 +106 @@
                         $details['download_link'] = null;
                         $details['preview_link']  = null;
-                        $details['helpscout']     = Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
+                        $details['helpscout']     = Helpscout::get_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
                 } else {
-                        $details['helpscout']     = Tools::get_helpscout_emails( $post, [ 'limit' => 1 ] );
+                        $details['helpscout']     = Helpscout::get_emails( $post, [ 'limit' => 1 ] );
                 }
 

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

@@ -4 +4 @@
 use WordPressdotorg\Plugin_Directory\Admin\Customizations;
 use WordPressdotorg\Plugin_Directory\Tools;
-use WordPressdotorg\Plugin_Directory\Admin\Tools\{ Author_Cards, Stats_Report, Upload_Token };
+use WordPressdotorg\Plugin_Directory\Admin\Tools\{ Author_Cards, Helpscout, Stats_Report, Upload_Token };
 
 /**
@@ -53 +53 @@
                 add_filter( 'allowed_redirect_hosts', array( $this, 'filter_redirect_hosts' ) );
                 add_filter( 'wp_get_attachment_url', array( $this, 'add_info_to_zip_url' ), 100, 2 );
+                add_action( 'post_updated', [ Helpscout::class, 'post_updated' ], 10, 3 );
 
                 add_filter( 'wp_resource_hints', array( $this, 'wp_resource_hints' ), 10, 2 );

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

@@ -10 +10 @@
 use WordPressdotorg\Plugin_Directory\Tools;
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
+use WordPressdotorg\Plugin_Directory\Tools\Helpscout;
 use WordPressdotorg\Plugin_Directory\Trademarks;
 use WordPressdotorg\Plugin_Directory\Admin\Tools\Upload_Token;
-use WordPressdotorg\Plugin_Directory\Clients\HelpScout;
+use WordPressdotorg\Plugin_Directory\Clients\Helpscout as Helpscout_Client;
 use WordPressdotorg\Plugin_Directory\Email\Plugin_Submission as Plugin_Submission_Email;
 
@@ -873 +874 @@
                 }
 
-                return Tools::get_helpscout_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
+                return Helpscout::get_emails( $post, [ 'subject' => 'Review in Progress:', 'limit' => 1 ] );
         }
 
@@ -921 +922 @@
                 ];
 
-                $result = HelpScout::api(
+                $result = Helpscout_Client::api(
                         '/v2/conversations/' . $review_email->id . '/reply',
                         $payload,