Changeset 11305

Timestamp:

11/02/2021 07:25:50 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: Slack Firehose: Include the commit message into the Slack logging when it's not an automated commit.

See #5899.

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (4 diffs)
• jobs/class-svn-import.php (modified) (2 diffs)

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

@@ -138 +138 @@
      */
     protected $importing_from = 'upload';
+
+    /**
+     * The SVN commit message, if user defined.
+     * 
+     * @var string
+     */
+    protected $commit_msg = '';
 
     /**
@@ -177 +184 @@
         $this->version_status = 'new';
         $this->importing_from = 'upload';
+        $this->commit_msg     = '';
 
         // $this->tmp_dir = '';    // Temporary folder per each instance of this class. Doesn't need to be reset each time.
@@ -222 +230 @@
      * @return true|WP_Error See ::import() for error conditions.
      */
-    public function process_update_from_svn( $slug, $version, $changeset = 0, $author = '' ) {
+    public function process_update_from_svn( $slug, $version, $changeset = 0, $author = '', $commit_message = '' ) {
         $this->reset_properties();
 
         $this->importing_from = 'svn';
         $this->theme_slug     = $slug;
+        $this->commit_msg     = $commit_message;
 
         // Check out from SVN.
@@ -1761 +1770 @@
                             ''
                         ),
+                ];
+            }
+
+            if ( $this->commit_msg ) {
+                $fields[] = [
+                    'type' => 'mrkdwn',
+                    'text' => "*Commit Message:*\n{$this->commit_msg}",
                 ];
             }

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

@@ -71 +71 @@
 
             $changeset = (int) $element->xpath( '@revision' )[0];
-            $author    = (string) $element->xpath( 'author' )[0];
-            $msg       = (string) $element->xpath( 'msg' )[0];
+            $author    = trim( (string) $element->xpath( 'author' )[0] );
+            $msg       = trim( (string) $element->xpath( 'msg' )[0] );
 
             $info = compact( 'slug', 'version', 'changeset', 'author', 'msg' );
@@ -116 +116 @@
             $args['version'],
             $args['changeset'] ?? false,
-            $args['author'] ?? false
+            $args['author'] ?? false,
+            $args['msg'] ?? ''
         );