Changeset 12170

Timestamp:

10/31/2022 07:39:54 AM (2 years ago)

Author:

dd32

Message:

Trac: PR Bot: Better formatting for when a comment is synced over from GitHub to Trac.

See #6555.

File:

• sites/trunk/trac.wordpress.org/templates/ticket_change.html (modified) (1 diff)

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

@@ -54 +54 @@
   </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 or change.fields else 'prbot without-context';
-         ">
+<py:when test="'author' in change and 'prbot' == change.author"
+        py:with="
+          wporg_user   = wporg_sanitize_user_nicename(change.author);
+          display_text = re.sub( '[{]+#!comment[^}]+[}]+', '', change.comment ).lstrip();
+          pr_byline    = display_text.partition('\n')[0];
+          pr_comment   = ''.join(display_text.partition('\n')[1:]) or False;
+          prbot_class  = 'prbot with-context' if pr_comment or change.fields else 'prbot without-context';
+        ">
   <h3 class="change chat-bot ${prbot_class}">
     <span class="avatar">