Context Navigation

← Previous Changeset
Next Changeset →

Changeset 11847

Timestamp:

05/16/2022 04:00:33 AM (4 years ago)

Author:

dd32

Message:

Trac: GitHub PRs: Use more specific matching for some PRs.

If the PR endpoint was called with a webhook payload which is for a repo that is not recognised by the endpoint, it would default to use core.trac, even if the ticket number was pulled from a non-core .trac.wordpress.org link.

This allows for the direct regex's to override the trac it ends up on when the link being matched is specific.

Also added a few other Repo's statically while I'm here.

File:

: 1 edited

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

-              r11666
+              r11847
         $ticket = false;
+        // If the trac found is the key, return the value.
+        $trac_redirects = [
+                // Themes trac mentions are likely Meta tickets.
+                'themes' => 'meta',
+        ];
         // For now, we assume everything is destined for the Core Trac.
         $trac = 'core';
 …
                         $trac = 'core';
                         break;
+                case 'buddypress/buddypress':
+                        $trac = 'buddypress';
+                        break;
+                case 'bbpress/bbPress':
+                        $trac = 'bbpress';
+                        break;
                 default:
+                        // If `?trac=....` is passed to the webhook endpoint:
                         if ( defined( 'WEBHOOK_TRAC_HINT' ) && WEBHOOK_TRAC_HINT ) {
                                 $trac = WEBHOOK_TRAC_HINT;
+                        }
+                        // If a specific trac is mentioned within the PR body:
+                        elseif ( preg_match( '!/(?P<trac>[a-z]+).trac.wordpress.org/!i', $pr->body, $m ) ) {
+                                $trac = $m['trac'];
+                        }
+                        // If the repo starts with 'wporg-' assume Meta.
+                        elseif ( str_starts_with( $pr->base->repo->full_name, 'WordPress/wporg-' ) ) {
+                                $trac = 'meta';
+                        }
                         break;
+        }
         $regexes = [
                 '!' . $trac . '.trac.wordpress.org/ticket/(\d+)!i',
+                '!(?P<trac>[a-z]+).trac.wordpress.org/ticket/(?P<id>\d+)!i',
                 '!(?:^|\s)#WP(\d+)!', // #WP1234
                 '!(?:^|\s)#(\d{4,5})!', // #1234
 …
                 '!\b(\d+)(\.\d)?\.(?:diff|patch)!i',
                 // Formats of common branches
                 '!(?:' . $trac . '|WordPress|fix|trac)[-/](\d+)!i',
+                '!((?P<trac>core|meta|bbpress|buddypress|themes)|WordPress|fix|trac)[-/](?P<id>\d+)!i',
                 // Starts or ends with a ticketish number
                 // These match things it really shouldn't, and are a last-ditch effort.
 …
                 ] as $field ) {
                         if ( preg_match( $regex, $field, $m ) ) {
+                                $id = $m['id'] ?? $m[1];
+                                // If a Trac-specific link is detected, use that trac.
+                                if ( ! empty( $m['trac'] ) ) {
+                                        $trac = $m['trac'];
+                                }
+                                $trac = $trac_redirects[ $trac ] ?? $trac;
                                 return [ $trac, $m[1] ];
+                        }

Note: See TracChangeset for help on using the changeset viewer.

Making WordPress.org

Context Navigation

Changeset 11847

Legend:

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

Download in other formats: