Changeset 9531

Timestamp:

02/24/2020 06:28:21 AM (5 years ago)

Author:

dd32

Message:

Trac: Github PRs: Include the PR bodytext in the Trac notification.

This should help include some more context in the PRs and also make it easier to keep all pertitant information in one place (Trac).

See #5054.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (1 diff)
• api.wordpress.org/public_html/dotorg/trac/pr/webhook.php (modified) (2 diffs)
• trac.wordpress.org/templates/site.html (modified) (1 diff)
• trac.wordpress.org/templates/ticket_change.html (modified) (2 diffs)
• wordpress.org/public_html/style/trac/wp-trac.css (modified) (1 diff)

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

@@ -24 +24 @@
         'closed_at'       => $data->closed_at,
         'mergeable_state' => $data->mergeable_state,
+        'body'            => $data->body,
         'user'            => (object) [
             'url'  => $data->user->html_url,

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

@@ -58 +58 @@
         }
 
+        // Remove the specific Trac Ticket and PR Body from the DB version.
         $_pr_data_no_ticket = clone $pr_data;
-        unset( $_pr_data_no_ticket->trac_ticket );
+        unset( $_pr_data_no_ticket->trac_ticket, $_pr_data_no_ticket->body );
 
         // Step 3. If not in DB, or $pr_data->trac_ticket isn't yet in the DB, add a new row of it.
@@ -83 +84 @@
                 "''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 [{$pr_data->user->url} {$pr_data->user->name}].''" .
+                    ( trim( $pr_data->body ) ? "\n{$pr_data->body}" : '' )
             );
         }

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-    scripts_version = '134'
+    scripts_version = '135'
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'

sites/trunk/trac.wordpress.org/templates/ticket_change.html

@@ -33 +33 @@
 
 <py:choose>
-<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author or ( 'prbot' == change.author and change.comment.startswith('\'\'') ) )"
+<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author)"
          py:with="wporg_user = wporg_sanitize_user_nicename(change.author)"  >
   <h3 class="change chat-bot">
@@ -53 +53 @@
     </div>
   </h3>
+</py:when>
+<py:when test="'author' in change and 'prbot' == change.author and change.comment.startswith('\'\'')"
+         py:with="
+           wporg_user  = wporg_sanitize_user_nicename(change.author);
+           pr_byline   = change.comment.partition('\n')[0];
+           pr_comment  = ''.join(change.comment.partition('\n')[1:]) or False;
+           prbot_class = 'prbot with-context' if pr_comment else 'prbot without-context';
+         ">
+  <h3 class="change chat-bot ${prbot_class}">
+    <span class="avatar">
+      <span class="username-line">
+        <img src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" />
+        ${wiki_to_html(context, pr_byline, escape_newlines=preserve_newlines)}
+      </span>
+      <br /><span class="time-ago">${dateinfo(change.date)} ago</span>
+    </span>
+  </h3>
+  <div py:if="pr_comment" class="comment searchable" xml:space="preserve">
+    ${wiki_to_html(context, pr_comment, escape_newlines=preserve_newlines)}
+  </div>
 </py:when>
 <py:otherwise>

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.css

@@ -880 +880 @@
     background: #fff;
     padding: 0 11px 1px 1em;
+}
+#changelog h3.change.prbot.with-context {
+    color: inherit;
+    margin: 1em -1em;
+    border: 1px;
+    border-bottom: none;
 }
 #changelog h3.change:after,