Changeset 12116

Timestamp:

10/12/2022 07:39:00 AM (4 years ago)

Author:

dd32

Message:

API: Trac GitHub Integration: When we know the WordPress.org user whose comments we're syncing from GitHub, link to the WordPress.org user rather than the GitHub user.

See #6533.

File:

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

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

@@ -134 +134 @@
             }
 
+            $authorship = "[{$pr_data->user->url} {$pr_data->user->name}]";
+            if ( $user_id ) {
+                $user       = get_user_by( 'id', $user_id );
+                $authorship = "[https://profiles.wordpress.org/{$user->user_nicename}/ @{$user->user_login}]";
+            }
+
             $trac->update(
                 $pr_data->trac_ticket[1],
                 "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
                     "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
-                    "by [{$pr_data->user->url} {$pr_data->user->name}].''" .
+                    "by {$authorship}.''" .
                     ( $pr_description ? "\n{$pr_description}" : '' ),
                 $attributes,  // Attributes changed
@@ -201 +207 @@
         }
 
-        $comment_template = "{{{#!comment\n%s\n}}}\n[%s %s] commented on [%s %s]:\n\n%s";
-        $comment_author   = find_wporg_user_by_github( $payload->comment->user->login );
+        $comment_template = "{{{#!comment\n%s\n}}}\n%s commented on [%s %s]:\n\n%s";
+        $user_id          = find_wporg_user_by_github( $payload->comment->user->login, 'ID' );
+        $authorship       = "[{$payload->comment->user->html_url} {$payload->comment->user->login}]";
+        $comment_author   = '';
         $comment_time     = new \DateTime( $payload->comment->created_at );
+
+        if ( $user_id ) {
+            $user           = get_user_by( 'id', $user_id );
+            $authorship     = "[https://profiles.wordpress.org/{$user->user_nicename}/ @{$user->user_login}]";
+            $comment_author = $user->user_login;
+        }
 
         $comment_body = sprintf(
             $comment_template,
             $payload->comment->id,
-            $payload->comment->user->html_url,
-            $payload->comment->user->login,
+            $authorship,
             $payload->comment->html_url,
             'PR #' . $payload->issue->number,