Fix issues with Slack integration (#1448)

Author: PepperLola

.github/workflows/slack/github.ts

@@ -228,6 +228,17 @@ const parseImages = (body: string): ParsedBody => {
     return { text, images }
 }
 
+const COMMENT = /<!--[\s\S]*?-->[ \t]*\r?\n?/g
+const BODY_LIMIT = 1000
+
+/**
+ * Truncates text to a character limit, appending an ellipsis
+ *
+ * @return string
+ */
+const truncate = (text: string, limit: number): string =>
+    text.length > limit ? `${text.slice(0, limit).trimEnd()}…` : text
+
 const SUGGESTION = /```suggestion\r?\n(.*?)```/gs
 
 /**
@@ -248,14 +259,17 @@ const jiraSection = (pr: PullRequest): Block => {
 }
 
 /**
- * Renders the PR body as a text section plus any inline images
+ * Renders the PR body as a text section plus any inline images, dropping
+ * template comments and capping length
  *
  * @return Block[]
  */
 const prBodyBlocks = (body: string | null): Block[] => {
     if (!body) return []
-    const { text, images } = parseImages(body)
-    return [...(text ? [section(mrkdwn(text))] : []), ...images]
+    // strip comments first so images inside them don't get extracted
+    const { text, images } = parseImages(body.replace(COMMENT, ""))
+    const capped = truncate(text, BODY_LIMIT)
+    return [...(capped ? [section(mrkdwn(capped))] : []), ...images]
 }
 
 /**

.github/workflows/slack/pr_review.ts

@@ -61,27 +61,45 @@ const send = async () => {
     const repo_owner = github.repository_owner
     const repo_name = github.event.repository.name
     const pr_number = github.event.pull_request.number
+    const pr_url = `https://api.github.com/repos/${repo_owner}/${repo_name}/pulls/${pr_number}`
 
     if (github.event_name === "pull_request_review_comment") {
         const event = reviewCommentEventFromContext(github)
-
+        const review_id = github.event.comment.pull_request_review_id
         const reply_to_id = github.event.comment.in_reply_to_id
-        if (reply_to_id) {
-            const url = `https://api.github.com/repos/${repo_owner}/${repo_name}/pulls/${pr_number}/comments?per_page=100`
-            const res = await ghGet(url)
+
+        // real review renders this comment in its collapsible
+        if (review_id) {
+            const res = await ghGet(`${pr_url}/reviews/${review_id}`)
+
+            if (res.ok) {
+                const review: any = await res.json()
+                if (review.body || review.state?.toLowerCase() !== "commented")
+                    process.exit(0)
+            }
+        }
+
+        if (review_id || reply_to_id) {
+            const res = await ghGet(`${pr_url}/comments?per_page=100`)
 
             if (res.ok) {
                 const all: any[] = await res.json()
-                // in_reply_to_id = thread root; want newest reply before mine
+                const siblings = all.filter(
+                    (c) => c.pull_request_review_id === review_id,
+                )
+                // wrapper holds one comment; more = batched review
+                if (siblings.length > 1) process.exit(0)
+                // in_reply_to_id = thread root; want newest before mine
                 const parent = all
                     .filter(
                         (c) =>
-                            (c.id === reply_to_id || c.in_reply_to_id === reply_to_id) &&
+                            (c.id === reply_to_id ||
+                                c.in_reply_to_id === reply_to_id) &&
                             c.id !== github.event.comment.id,
                     )
                     .sort((a, b) => a.id - b.id)
                     .at(-1)
-                if (parent?.user && parent.body != null) {
+                if (reply_to_id && parent?.user && parent.body != null) {
                     event.replyTo = { author: parent.user.login, body: parent.body }
                 }
             }
@@ -99,13 +117,14 @@ const send = async () => {
     if (github.event.action !== "dismissed") {
         const review_id = github.event.review.id
 
-        const url = `https://api.github.com/repos/${repo_owner}/${repo_name}/pulls/${pr_number}/reviews/${review_id}/comments?per_page=100`
-        const comments_res = await ghGet(url)
+        const comments_res = await ghGet(
+            `${pr_url}/reviews/${review_id}/comments?per_page=100`,
+        )
 
         comments = await comments_res.json()
     }
 
-    // lone bodyless comment = single/reply wrapper, already sent; batches (>1) kept
+    // lone bodyless comment = wrapper, already sent; batches kept
     if (
         github.event.review.state === "commented" &&
         !github.event.review.body &&
@@ -116,17 +135,22 @@ const send = async () => {
 
     const event = reviewEventFromContext(github)
 
-    // dismiss message isn't in the payload; pull it from the timeline
+    // dismiss message isn't in the payload
     if (github.event.action === "dismissed") {
         const url = `https://api.github.com/repos/${repo_owner}/${repo_name}/issues/${pr_number}/timeline?per_page=100`
         const res = await ghGet(url)
 
         if (res.ok) {
             const events: any[] = await res.json()
             const dismissal = events
-                .filter(e => e.event === "review_dismissed" && e.dismissed_review?.review_id === github.event.review.id)
+                .filter(
+                    (e) =>
+                        e.event === "review_dismissed" &&
+                        e.dismissed_review?.review_id === github.event.review.id,
+                )
                 .at(-1)
-            if (dismissal?.dismissed_review?.dismissal_message) event.review.body = dismissal.dismissed_review.dismissal_message
+            if (dismissal?.dismissed_review?.dismissal_message)
+                event.review.body = dismissal.dismissed_review.dismissal_message
         }
     }