<!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>[12116] sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php: 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.</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/12116">12116</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/12116","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-10-12 07:39:00 +0000 (Wed, 12 Oct 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'>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 <a href="http://meta.trac.wordpress.org/ticket/6533">#6533</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracprwebhookphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracprwebhookphp"></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/trac/pr/webhook.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/trac/pr/webhook.php 2022-10-11 10:52:44 UTC (rev 12115)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php 2022-10-12 07:39:00 UTC (rev 12116)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,11 +133,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes['keywords'] = implode( ' ', $keywords );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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}]";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $trac->update(
</span><span class="cx" style="display: block; padding: 0 10px"> $pr_data->trac_ticket[1],
</span><span class="cx" style="display: block; padding: 0 10px"> "''This ticket was mentioned in [{$pr_data->html_url} PR #{$pr_number}] " .
</span><span class="cx" style="display: block; padding: 0 10px"> "on [https://github.com/{$pr_repo}/ {$pr_repo}] " .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "by [{$pr_data->user->url} {$pr_data->user->name}].''" .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "by {$authorship}.''" .
</ins><span class="cx" style="display: block; padding: 0 10px"> ( $pr_description ? "\n{$pr_description}" : '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes, // Attributes changed
</span><span class="cx" style="display: block; padding: 0 10px"> true // Notify
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,15 +206,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die( 'PR Not linked to any tickets' );
</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">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_time = new \DateTime( $payload->comment->created_at );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_body = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_template,
</span><span class="cx" style="display: block; padding: 0 10px"> $payload->comment->id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $payload->comment->user->html_url,
- $payload->comment->user->login,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $authorship,
</ins><span class="cx" style="display: block; padding: 0 10px"> $payload->comment->html_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'PR #' . $payload->issue->number,
</span><span class="cx" style="display: block; padding: 0 10px"> format_github_content_for_trac_comment( $payload->comment->body )
</span></span></pre>
</div>
</div>
</body>
</html>