Merge pull request #2026 from Urgau/rework-concern-note-help

Rework `concern` and `note` help message

Author: Urgau

src/handlers/concern.rs

@@ -107,7 +107,7 @@ pub(super) async fn handle_command(
     }
 
     // Create the new markdown content listing all the concerns
-    let new_content = markdown_content(&concern_data.concerns);
+    let new_content = markdown_content(&concern_data.concerns, &ctx.username);
 
     // Add or remove the labels
     if concern_data
@@ -149,7 +149,7 @@ pub(super) async fn handle_command(
     Ok(())
 }
 
-fn markdown_content(concerns: &[Concern]) -> String {
+fn markdown_content(concerns: &[Concern], bot: &str) -> String {
     if concerns.is_empty() {
         return "".to_string();
     }
@@ -185,7 +185,7 @@ fn markdown_content(concerns: &[Concern]) -> String {
     }
 
     let _ = writeln!(md, "");
-    let _ = writeln!(md, "Generated by triagebot, see [help](https://forge.rust-lang.org/triagebot/concern.html) for how to use them.");
+    let _ = writeln!(md, "*Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*");
 
     md
 }
@@ -210,14 +210,14 @@ fn simple_markdown_content() {
     ];
 
     assert_eq!(
-        markdown_content(concerns),
+        markdown_content(concerns, "rustbot"),
         r#"
 # Concerns
 
  - [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)
 
-Generated by triagebot, see [help](https://forge.rust-lang.org/triagebot/concern.html) for how to use them.
+*Managed by `@rustbot`—see [help](https://forge.rust-lang.org/triagebot/concern.html) for details.*
 "#
     );
 }

src/handlers/note.rs

@@ -15,7 +15,7 @@
 //!
 //! - [Summary title](link-to-comment) by [username](https://github.com/<username>)
 //!
-//! Generated by triagebot, see [help](https://forge.rust-lang.org/triagebot/note.html) for how to add more
+//! *Managed by `@bot`—see [help](https://forge.rust-lang.org/triagebot/note.html) for details*
 //! <!-- TRIAGEBOT_SUMMARY_END -->
 //! ```
 //!
@@ -37,6 +37,7 @@
 use crate::{config::NoteConfig, github::Event, handlers::Context, interactions::EditIssueBody};
 use itertools::Itertools;
 use parser::command::note::NoteCommand;
+use std::fmt::Write;
 use std::{cmp::Ordering, collections::HashMap};
 use tracing as log;
 
@@ -100,7 +101,7 @@ impl NoteData {
         }
     }
 
-    pub(crate) fn to_markdown(&self) -> String {
+    pub(crate) fn to_markdown(&self, bot: &str) -> String {
         if self.entries_by_url.is_empty() {
             return String::new();
         }
@@ -109,7 +110,7 @@ impl NoteData {
         for (_, entry) in self.entries_by_url.iter().sorted() {
             text.push_str(&entry.to_markdown());
         }
-        text.push_str("\n\nGenerated by triagebot, see [help](https://forge.rust-lang.org/triagebot/note.html) for how to add more");
+        let _ = writeln!(text, "\n\n*Managed by `@{bot}`—see [help](https://forge.rust-lang.org/triagebot/note.html) for details*");
         text
     }
 }
@@ -154,7 +155,7 @@ pub(super) async fn handle_command(
         }
     }
 
-    let new_markdown = current.to_markdown();
+    let new_markdown = current.to_markdown(&ctx.username);
     log::debug!("New MD: {:#?}", new_markdown);
 
     e.apply(&ctx.github, new_markdown, current).await?;