Changeset 9218

Timestamp:

10/21/2019 07:12:19 AM (5 years ago)

Author:

dd32

Message:

Slack: Attempt to pipe commits to channels when the commit message starts with the component.

See #4471.

Location:

sites/trunk/common/includes/slack/trac

Files:

• commit-handler.php (modified) (1 diff)
• trac.php (modified) (3 diffs)

sites/trunk/common/includes/slack/trac/commit-handler.php

@@ -22 +22 @@
     public function run() {
         $this->generate_payload();
-        foreach ( $this->trac->get_commit_channels( $this->svnlook( 'changed' ) ) as $channel ) {
+        foreach ( $this->trac->get_commit_channels( $this->svnlook( 'changed' ), $this->svnlook( 'log' ) ) as $channel ) {
             $this->send->send( $channel );
         }

sites/trunk/common/includes/slack/trac/trac.php

@@ -80 +80 @@
                 $this->ticket_component_filters[ $component ] = array( $channel => true );
             }
-            if ( $this->bypass_primary_channel_for_ticket_filter_matches && empty( $this->ticket_component_filters[ $component ][ $this->primary_channel ] ) ) {
-                $this->ticket_component_filters[ $component ][ $this->primary_channel ] = false;
-            }
+            if ( $this->bypass_primary_channel_for_ticket_filter_matches && empty( $this->ticket_component_filters[ $component ][ $this->primary_channel ] ) ) {
+                $this->ticket_component_filters[ $component ][ $this->primary_channel ] = false;
+            }
         }
     }
@@ -211 +211 @@
     }
 
-    function get_commit_channels( $changed_files = null ) {
+    function get_commit_channels( $changed_files = null, $log_text = null ) {
         $channels = array();
 
@@ -233 +233 @@
         }
 
+        foreach ( $this->ticket_component_filters as $component => $channels_to_add ) {
+            if ( 0 === stripos( $log_text, $component ) ) {
+                $channels = array_merge( $channels, (array) $channels_to_add );
+            }
+        }
+
         if ( $this->firehose_channel ) {
             $channels[ $this->firehose_channel ] = true;