Changeset 11544 for sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/index.php

Timestamp:

02/10/2022 09:38:45 AM (3 years ago)

Author:

dd32

Message:

Trac: Add the ability to include Tickets that you've added a GitHub PR to, in the 'my patches' reports.

See ​https://core.trac.wordpress.org/my-patches + https://meta.trac.wordpress.org/report/12
Fixes #5596.

File:

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

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

@@ -7 +7 @@
 $trac          = preg_replace( '![^a-z]!', '', $_GET['trac'] ?? '' );
 $ticket        = intval( $_GET['ticket'] ?? 0 );
+$author        = wp_unslash( $_GET['author'] ?? '' );
 $authenticated = ! empty( $_GET['authenticated'] ); // Longer caches for logged out requests.
 
-if ( empty( $trac ) || empty( $ticket ) ) {
+header( 'Content-Type: application/json' );
+header( 'Access-Control-Allow-Origin: *' );
+
+if ( empty( $trac ) || ( empty( $ticket ) && empty( $author ) ) ) {
     header( 'HTTP/1.0 400 Bad Request' );
-    header( 'Content-Type: application/json' );
-    die( '{"error":"Ticket number is invalid."}' );
+    die( '{"error":"Trac, Ticket number, or Author is invalid."}' );
+}
+
+// Type one: Return PRs by Author.
+if ( $author ) {
+    header( 'Cache-Control: max-age=' . HOUR_IN_SECONDS );
+    header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() + HOUR_IN_SECONDS ) );
+
+    $user_id = get_user_by( 'slug', $author )->ID ?? 0;
+
+    $tickets = $wpdb->get_col( $wpdb->prepare(
+        "SELECT `ticket`
+        FROM `trac_github_prs`
+        WHERE trac = %s AND author = %d",
+        $trac,
+        $user_id
+    ) );
+
+    echo wp_json_encode( $tickets );
+    die();
 }
 
 // Fetch any linked PRs
 $prs = $wpdb->get_results( $wpdb->prepare(
-    "SELECT `repo`, `pr`, `data`, `last_checked`
+    "SELECT `repo`, `pr`, `data`, `last_checked`, `author`
     FROM `trac_github_prs`
     WHERE trac = %s AND ticket = %s",
@@ -65 +87 @@
             unset( $data->data->trac_ticket );
 
+            // Check if we now have an author for this PR, the author may link their account after creating the PR.
+            if ( ! $data->author ) {
+                $data->author = (int) find_wporg_user_by_github( $pr_data->user->name, 'ID' );
+            }
+
             $wpdb->update(
                 'trac_github_prs',
@@ -70 +97 @@
                     'data'         => json_encode( $pr_data ),
                     'last_checked' => gmdate( 'Y-m-d H:i:s' ),
+                    'author'       => $data->author,
                 ],
                 [
@@ -98 +126 @@
 header( 'Cache-Control: max-age=' . $expiry );
 header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() + $expiry ) );
-header( 'Content-Type: application/json' );
-header( 'Access-Control-Allow-Origin: *' );
 
 // Only return the actual PR data needed