<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[9228] sites/trunk: Slack: Thread trac-bot ticket responses.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9228">9228</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9228","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-24 04:06:42 +0000 (Thu, 24 Oct 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/2555">#2555</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgslacktracbotphp">sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php</a></li>
<li><a href="#sitestrunkcommonincludesslacksendphp">sites/trunk/common/includes/slack/send.php</a></li>
<li><a href="#sitestrunkcommonincludesslacktracbotphp">sites/trunk/common/includes/slack/trac/bot.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgslacktracbotphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php 2019-10-24 02:03:33 UTC (rev 9227)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php 2019-10-24 04:06:42 UTC (rev 9228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slack->send( $parser->get_channel() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slack->send( $parser->get_channel(), $parser->get_thread() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_POST['channel_name'] === 'test' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't post to Trac if we're coming from #test.
</span></span></pre></div>
<a id="sitestrunkcommonincludesslacksendphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/send.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/send.php 2019-10-24 02:03:33 UTC (rev 9227)
+++ sites/trunk/common/includes/slack/send.php 2019-10-24 04:06:42 UTC (rev 9228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->testing = (bool) $enabled;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function send( $channel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function send( $channel, $thread = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->testing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_text( "[$channel] " . $this->get_text() );
</span><span class="cx" style="display: block; padding: 0 10px"> $channel = '#test';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,6 +109,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = $this->get_payload();
</span><span class="cx" style="display: block; padding: 0 10px"> $payload['channel'] = $channel;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> # error_log( print_r( $payload, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = json_encode( $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = http_build_query( compact( 'payload' ) );
</span></span></pre></div>
<a id="sitestrunkcommonincludesslacktracbotphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/trac/bot.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/trac/bot.php 2019-10-24 02:03:33 UTC (rev 9227)
+++ sites/trunk/common/includes/slack/trac/bot.php 2019-10-24 04:06:42 UTC (rev 9228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return '#' . $this->post_data['channel_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function get_thread() {
+ return $this->post_data['thread_ts'] ?? false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function parse() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->parse_tickets( $this->post_data['text'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->parse_commits( $this->post_data['text'] );
</span></span></pre>
</div>
</div>
</body>
</html>