<!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>[11582] sites/trunk: Slack: Don't post a "This ticket was mentioned in.." on old closed Trac tickets.</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/11582">11582</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/11582","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>2022-02-18 05:43:57 +0000 (Fri, 18 Feb 2022)</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: Don't post a "This ticket was mentioned in.." on old closed Trac tickets.
This still posts the Ticket reference to Slack, but if the ticket has been has been closed over 2 years avoids littering it with references that were probably not about it.
See the ticket for an example of where a GitHub reference posted to a ticket that had been closed for 14 years.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3650">#3650</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="#sitestrunkcommonincludesslacktracticketphp">sites/trunk/common/includes/slack/trac/ticket.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 2022-02-18 03:30:31 UTC (rev 11581)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php 2022-02-18 05:43:57 UTC (rev 11582)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slack = new \Dotorg\Slack\Send( \Dotorg\Slack\Send\WEBHOOK );
</span><span class="cx" style="display: block; padding: 0 10px"> $slack->set_user( $trac_obj );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_objects = array(
+ 'ticket' => array(),
+ 'commit' => array(),
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $type => $values ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through all tickets and commits for this Trac.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $values as $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the Ticket or Commit object for this Trac + ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = call_user_func( array( $class, 'get' ), $trac_obj, $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Keep a reference to this object for later.
+ $parsed_objects[ $type ][ $id ] = $obj;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check if we should be posting this to Slack so quickly.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $since = $parser->is_redundant( 'slack', $trac, $type, $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we should not be posting the whole thing, see if it's been long enough to post a link (only if we did not parse a link).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +104,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">- // If there's no tickets referenced (ie. just commits) then there's no need to flag tghe reference on Trac.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's no tickets referenced (ie. just commits) then there's no need to flag the reference on Trac.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $results['ticket'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,16 +113,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = sprintf( $comment_template, $_POST['channel_name'], $_POST['user_name'], str_replace( '.', '', $_POST['timestamp'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results['ticket'] as $ticket ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array( $ticket ) ) {
- $ticket = $ticket['id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ticket_id = is_array( $ticket ) ? $ticket['id'] : $ticket;
+
+ // If the ticket is closed and hasn't been modified in over 2 years, don't post a reference to it.
+ if ( ! empty( $parsed_objects[ 'ticket' ][ $ticket_id ] ) ) {
+ $ticket_object = $parsed_objects[ 'ticket' ][ $ticket_id ];
+ $ticket_object->fetch();
+
+ $is_closed = ( 'closed' === $ticket_object->status );
+ $last_modified = strtotime( $ticket_object->modified );
+ $has_recent_change = ( ! $last_modified || $last_modified > ( time() - 2 * YEAR_IN_SECONDS ) );
+
+ if ( $is_closed && ! $has_recent_change ) {
+ continue;
+ }
</ins><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">- if ( $parser->is_redundant( 'trac', $trac, 'ticket', $ticket ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parser->is_redundant( 'trac', $trac, 'ticket', $ticket_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parser->set_redundancy( 'trac', $trac, 'ticket', $ticket );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trac_xmlrpc->ticket_update( $ticket, $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parser->set_redundancy( 'trac', $trac, 'ticket', $ticket_id );
+
+ $trac_xmlrpc->ticket_update( $ticket_id, $comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkcommonincludesslacktracticketphp"></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/ticket.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/trac/ticket.php 2022-02-18 03:30:31 UTC (rev 11581)
+++ sites/trunk/common/includes/slack/trac/ticket.php 2022-02-18 05:43:57 UTC (rev 11582)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '%s/query?id=%s&col=id&col=summary&col=owner&col=type&col=cc&col=status&col=priority&col=milestone&col=component&col=version&col=severity&col=resolution&col=time&col=focuses&col=reporter&col=keywords&col=description&format=csv',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '%s/query?id=%s&col=id&col=summary&col=owner&col=type&col=cc&col=status&col=priority&col=milestone&col=component&col=version&col=severity&col=resolution&col=time&col=changetime&col=focuses&col=reporter&col=keywords&col=description&format=csv',
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->trac->get_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->id
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>