Merge pull request #2030 from Urgau/concern-visual-rework

Bring concerns visual to modern GitHub UI feature

Author: Urgau

src/handlers/concern.rs

@@ -21,7 +21,6 @@ struct ConcernData {
 #[derive(Debug, PartialEq, Eq, Clone, serde::Serialize, serde::Deserialize)]
 struct Concern {
     title: String,
-    author: String,
     comment_url: String,
     status: ConcernStatus,
 }
@@ -44,7 +43,6 @@ pub(super) async fn handle_command(
     let Some(comment_url) = event.html_url() else {
         bail!("unable to retrieve the comment url")
     };
-    let author = event.user().login.to_owned();
     let issue = &issue_comment.issue;
 
     // Verify that this issue isn't a rfcbot FCP, skip if it is
@@ -100,7 +98,6 @@ pub(super) async fn handle_command(
             {
                 concern_data.concerns.push(Concern {
                     title,
-                    author,
                     status: ConcernStatus::Active,
                     comment_url: comment_url.to_string(),
                 });
@@ -165,38 +162,47 @@ fn markdown_content(concerns: &[Concern], bot: &str) -> String {
         return "".to_string();
     }
 
+    let active_concerns = concerns
+        .iter()
+        .filter(|c| matches!(c.status, ConcernStatus::Active))
+        .count();
+
     let mut md = String::new();
 
-    let _ = writeln!(md, "\n# Concerns");
     let _ = writeln!(md, "");
 
+    if active_concerns > 0 {
+        let _ = writeln!(md, "> [!CAUTION]");
+    } else {
+        let _ = writeln!(md, "> [!NOTE]");
+    }
+
+    let _ = writeln!(md, "> # Concerns ({active_concerns} active)");
+    let _ = writeln!(md, ">");
+
     for &Concern {
         ref title,
-        ref author,
         ref status,
         ref comment_url,
     } in concerns
     {
         let _ = match status {
             ConcernStatus::Active => {
-                writeln!(
-                    md,
-                    " - [{title}]({comment_url}) by [{author}](https://github.com/{author})"
-                )
+                writeln!(md, "> - [{title}]({comment_url})")
             }
             ConcernStatus::Resolved {
                 comment_url: resolved_comment_url,
             } => {
                 writeln!(
                     md,
-                    " - ~~[{title}]({comment_url}) by [{author}](https://github.com/{author})~~ resolved [in this comment]({resolved_comment_url})"
+                    "> - ~~[{title}]({comment_url})~~ resolved [in this comment]({resolved_comment_url})"
                 )
             }
         };
     }
 
-    let _ = writeln!(md, "");
-    let _ = writeln!(md, "*Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*");
+    let _ = writeln!(md, ">");
+    let _ = writeln!(md, "> *Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*");
 
     md
 }
@@ -206,13 +212,11 @@ fn simple_markdown_content() {
     let concerns = &[
         Concern {
             title: "This is my concern about concern".to_string(),
-            author: "Urgau".to_string(),
             status: ConcernStatus::Active,
             comment_url: "https://github.com/fake-comment-1234".to_string(),
         },
         Concern {
             title: "This is a resolved concern".to_string(),
-            author: "Kobzol".to_string(),
             status: ConcernStatus::Resolved {
                 comment_url: "https:://github.com/fake-comment-8888".to_string(),
             },
@@ -223,12 +227,36 @@ fn simple_markdown_content() {
     assert_eq!(
         markdown_content(concerns, "rustbot"),
         r#"
-# Concerns
+> [!CAUTION]
+> # Concerns (1 active)
+>
+> - [This is my concern about concern](https://github.com/fake-comment-1234)
+> - ~~[This is a resolved concern](https://github.com/fake-comment-4561)~~ resolved [in this comment](https:://github.com/fake-comment-8888)
+>
+> *Managed by `@rustbot`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*
+"#
+    );
+}
 
- - [This is my concern about concern](https://github.com/fake-comment-1234) by [Urgau](https://github.com/Urgau)
- - ~~[This is a resolved concern](https://github.com/fake-comment-4561) by [Kobzol](https://github.com/Kobzol)~~ resolved [in this comment](https:://github.com/fake-comment-8888)
+#[test]
+fn resolved_concerns_markdown_content() {
+    let concerns = &[Concern {
+        title: "This is a resolved concern".to_string(),
+        status: ConcernStatus::Resolved {
+            comment_url: "https:://github.com/fake-comment-8888".to_string(),
+        },
+        comment_url: "https://github.com/fake-comment-4561".to_string(),
+    }];
 
-*Managed by `@rustbot`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*
+    assert_eq!(
+        markdown_content(concerns, "rustbot"),
+        r#"
+> [!NOTE]
+> # Concerns (0 active)
+>
+> - ~~[This is a resolved concern](https://github.com/fake-comment-4561)~~ resolved [in this comment](https:://github.com/fake-comment-8888)
+>
+> *Managed by `@rustbot`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*
 "#
     );
 }