Changeset 11582

Timestamp:

02/18/2022 05:43:57 AM (3 years ago)

Author:

dd32

Message:

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 #3650.

Location:

sites/trunk

Files:

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

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

@@ -38 +38 @@
         $slack->set_user( $trac_obj );
 
+        $parsed_objects = array(
+            'ticket' => array(),
+            'commit' => array(),
+        );
+
         foreach ( $results as $type => $values ) {
             // Loop through all tickets and commits for this Trac.
@@ -46 +51 @@
                 // Get the Ticket or Commit object for this Trac + ID.
                 $obj = call_user_func( array( $class, 'get' ), $trac_obj, $id );
+
+                // Keep a reference to this object for later.
+                $parsed_objects[ $type ][ $id ] = $obj;
 
                 // Check if we should be posting this to Slack so quickly.
@@ -97 +105 @@
         }
 
-        // If there's no tickets referenced (ie. just commits) then there's no need to flag tghe reference on Trac.
+        // If there's no tickets referenced (ie. just commits) then there's no need to flag the reference on Trac.
         if ( empty( $results['ticket'] ) ) {
             continue;
@@ -106 +114 @@
         $comment = sprintf( $comment_template, $_POST['channel_name'], $_POST['user_name'], str_replace( '.', '', $_POST['timestamp'] ) );
         foreach ( $results['ticket'] as $ticket ) {
-            if ( is_array( $ticket ) ) {
-                $ticket = $ticket['id'];
+            $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;
+                }
             }
 
-            if ( $parser->is_redundant( 'trac', $trac, 'ticket', $ticket ) ) {  
+            if ( $parser->is_redundant( 'trac', $trac, 'ticket', $ticket_id ) ) {
                 continue;
             }
-            $parser->set_redundancy( 'trac', $trac, 'ticket', $ticket );
 
-            $trac_xmlrpc->ticket_update( $ticket, $comment );
+            $parser->set_redundancy( 'trac', $trac, 'ticket', $ticket_id );
+
+            $trac_xmlrpc->ticket_update( $ticket_id, $comment );
         }
     }

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

@@ -64 +64 @@
 
         $url = sprintf(
-            '%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',
+            '%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',
             $this->trac->get_url(),
             $this->id