Changeset 11588

Timestamp:

02/21/2022 08:18:07 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: Add an email for failed theme imports from SVN.

Theme Check still runs on theme updates via SVN, and will reject themes that do not need requirements.

See #5899.

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (13 diffs)
• jobs/class-svn-import.php (modified) (2 diffs)
• theme-directory.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -53 +53 @@
          * @var string
          */
-        protected $tmp_dir = '';
+        public $tmp_dir = '';
 
         /**
@@ -60 +60 @@
          * @var string
          */
-        protected $tmp_svn_dir = '';
+        public $tmp_svn_dir = '';
 
         /**
@@ -67 +67 @@
          * @var string
          */
-        protected $theme_dir = '';
+        public $theme_dir = '';
 
         /**
@@ -74 +74 @@
          * @var WP_Theme
          */
-        protected $theme;
+        public $theme;
 
         /**
@@ -81 +81 @@
          * @var string
          */
-        protected $theme_slug = '';
+        public $theme_slug = '';
 
         /**
@@ -88 +88 @@
          * @var WP_Post
          */
-        protected $theme_post;
+        public $theme_post;
 
         /**
@@ -95 +95 @@
          * @var WP_User
          */
-        protected $author;
+        public $author;
 
         /**
@@ -102 +102 @@
          * @var array
          */
-        protected $readme = array();
+        public $readme = array();
 
         /**
@@ -109 +109 @@
          * @var object
          */
-        protected $trac_ticket;
+        public $trac_ticket;
 
         /**
@@ -116 +116 @@
          * @var int
          */
-        protected $trac_changeset = 0;
+        public $trac_changeset = 0;
 
         /**
@@ -123 +123 @@
          * @var Trac
          */
-        protected $trac;
+        public $trac;
 
         /**
@@ -144 +144 @@
          * @var string
          */
-        protected $commit_msg = '';
+        public $commit_msg = '';
 
         /**
@@ -1761 +1761 @@
                                                         // When importing from SVN, include a 'Compare' link as the Changeset likely won't show a Diff unless the author did a `svn cp`.
                                                         'svn' === $this->importing_from && ! empty( $this->theme_post->max_version ) ?
-                                                        "<https://themes.trac.wordpress.org/changeset?old_path={$this->theme_slug}/{$this->theme_post->max_version}&new_path={$this->theme_slug}/{$this->theme->display( 'Version' )}|Compare>" :
+                                                        "<https://themes.trac.wordpress.org/changeset?old_path={$this->theme_slug}/{$this->theme_post->_last_live_version}&new_path={$this->theme_slug}/{$this->theme->display( 'Version' )}|Compare>" :
                                                         ''
                                                 ),

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/jobs/class-svn-import.php

@@ -106 +106 @@
 
                 if ( empty( $args['slug'] ) || empty( $args['version'] ) ) {
-                        trigger_error( 'Theme Import aborted, invalid input provided: ' . json_Encode( $args ), E_USER_WARNING );
+                        trigger_error( 'Theme Import aborted, invalid input provided: ' . json_encode( $args ), E_USER_WARNING );
                         return;
                 }
@@ -115 +115 @@
                         $args['slug'],
                         $args['version'],
-                        $args['changeset'] ?? false,
-                        $args['author'] ?? false,
-                        $args['msg'] ?? ''
+                        $args['changeset'],
+                        $args['author'],
+                        $args['msg']
                 );
 
-                // TODO: Look at error result code, maybq re-queue in event of system issue, else email author with concerns (Theme Check, etc)
-                //       CC emails to themes team in event of having to contact the author?
+                if ( is_wp_error( $return ) ) {
 
-                if ( is_wp_error( $return ) ) {
-                        throw new Exception( "Theme Import Failure: " . $return->get_error_code . ' ' . $return->get_error_message() );
+                        // Retry once in the event of a WordPress.org issue exporting from themes.svn.wordpress.org.
+                        if ( 'svn_error' === $return->get_error_code() ) {
+                                if ( empty( $args['retry'] ) ) {
+                                        $args['retry'] = $return;
+                                        wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'theme_directory_svn_import', $args );
+                                        return;
+                                } else {
+                                        throw new Exception( 'Theme Import Failure: ' . $return->get_error_code() . ' ' . $return->get_error_message() );
+                                }
+                        }
+
+                        // Otherwise email the author about this problem.
+                        wp_mail(
+                                // $uploader->author->user_email,
+                                get_user_by( 'login', 'dd32' )->user_email, // TODO, DEBUG for now.
+                                sprintf(
+                                        'Theme Import Failure: %s [%d] %s',
+                                        $uploader->theme_post->post_title,
+                                        $args['changeset'],
+                                        $args['msg']
+                                ),
+                                sprintf(
+                                        "Hi %s,\n\nYour theme update for %s %s has failed some checks. Please see the below errors.\n\n%s\n\n----\nWordPress Theme Directory",
+                                        $uploader->author->user_email . ' ' .
+                                        ( $uploader->author->display_name ?: $uploader->author->user_login ),
+                                        $uploader->theme->display('Title'),
+                                        $uploader->theme->display('Version'),
+                                        $return->get_error_message(),
+                                ),
+                                [
+                                        'From: "WordPress Theme Directory" <themes@wordpress.org>'
+                                ]
+                        );
                 }
         }

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

@@ -532 +532 @@
                 $post = get_post( $post_id );
         }
+
+        // Keep track of the last live version.
+        update_post_meta( $post_id, '_last_live_version', get_post_meta( $post_id, '_live_version', true ) );
 
         // Update current version. Used to prioritize localized themes.