Changeset 7064

Timestamp:

04/08/2018 11:43:27 AM (7 years ago)

Author:

ocean90

Message:

Slack/Trac: Add support for attachment notification mails.

See #3526.

Location:

sites/trunk

Files:

• common/includes/slack/trac/comment-handler.php (modified) (2 diffs)
• svn.wordpress.org/bin/slack-trac-hook.php (modified) (1 diff)

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

@@ -37 +37 @@
             $line = array_shift( $lines );
             if ( 0 === strpos( $line, 'X-Trac-Ticket-URL:' ) ) {
-                // X-Trac-Ticket-URL: https://core.trac.wordpress.org/ticket/12345#comment:1
+                $comment_id = 0;
                 list( , $comment_url ) = explode( ': ', $line );
-                list( $ticket_url, $comment_id ) = explode( '#comment:', $comment_url );
+
+                // Get ticket URL, attachment notifcations have no specific URL.
+                if ( false !== strpos( $line, '#comment:' ) ) {
+                    // X-Trac-Ticket-URL: https://core.trac.wordpress.org/ticket/12345#comment:1
+                    list( $ticket_url, $comment_id ) = explode( '#comment:', $comment_url );
+                } else {
+                    // X-Trac-Ticket-URL: https://core.trac.wordpress.org/ticket/12345
+                    $ticket_url = $comment_url;
+                }
+
                 list( $trac_url, $ticket_id ) = explode( '/ticket/', $ticket_url );
 
@@ -167 +176 @@
         if ( $has_changes ) {
             while ( $lines && '' !== current( $lines ) ) {
-                $changes[] = preg_replace( '~^ \* (.*?):  ~', '_*$1:*_ ', array_shift( $lines ) );
+                $line = array_shift( $lines );
+
+                if ( preg_match( '~Attachment "([^"]+)" (added|removed)\.$~', $line, $matches ) ) { // * Attachment "test.txt" added/removed.
+                    $changes[] = "_*attachment:*_ `{$matches[1]}` {$matches[2]}";
+                } else { // * status:  assigned => closed
+                    $changes[] = preg_replace( '~^ \* (.*?):  ~', '_*$1:*_ ', $line );
+                }
             }
         }

sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php

@@ -24 +24 @@
     $ticket_base_url = $matches[3];
     $ticket = $matches[4];
-    $type = isset( $matches[5] ) ? 'comment' : 'ticket';
+    // Attachment notifcations use the ticket URL, check for attachment change line and process mail as comment on match.
+    $is_attachment = (bool) preg_grep( '/^ \* Attachment "([^"]+)"/', $lines );
+    $type = ( isset( $matches[5] ) || $is_attachment ) ? 'comment' : 'ticket';
     preg_match( '~^https?://([^.]+)\.trac~i', $ticket_base_url, $matches );
     $trac = $matches[1];