Changeset 9228

Timestamp:

10/24/2019 04:06:42 AM (5 years ago)

Author:

dd32

Message:

Slack: Thread trac-bot ticket responses.

When a ticket is referenced within a thread, trac-bot will no longer send it to the global channel (often wtihout any context).

There's an option to reply in-thread, but also to broadcast to the wider channel, but thought that best to avoid for now.
Unfortunately the slack outgoing-webhook implementation doesn't announce whether the threaded message we're being triggered by was broadcast or not.

Fixes #2555.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/slack/trac-bot.php (modified) (1 diff)
• common/includes/slack/send.php (modified) (2 diffs)
• common/includes/slack/trac/bot.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php

@@ -92 +92 @@
         }
 
-        $slack->send( $parser->get_channel() );
+        $slack->send( $parser->get_channel(), $parser->get_thread() );
 
         if ( $_POST['channel_name'] === 'test' ) {

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

@@ -101 +101 @@
     }
 
-    function send( $channel ) {
+    function send( $channel, $thread = false ) {
         if ( $this->testing() ) {
             $this->set_text( "[$channel] " . $this->get_text() );
@@ -109 +109 @@
         $payload = $this->get_payload();
         $payload['channel'] = $channel;
+
+        if ( $thread ) {
+            $payload['thread_ts'] = $thread;
+
+            // Setting this to true will broacast a threaded reply to the channel too.
+            // Since outgoing webhooks don't send the broadcast status, this is skipped for now.
+            // $payload['reply_broadcast'] = true;
+        }
 
         # error_log( print_r( $payload, true ) );

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

@@ -31 +31 @@
     function get_channel() {
         return '#' . $this->post_data['channel_name'];
+    }
+
+    function get_thread() {
+        return $this->post_data['thread_ts'] ?? false;
     }