Improve message format

Author: linyinfeng

src/chat/mod.rs

@@ -17,7 +17,7 @@ use crate::{
     error::Error,
     github::{self, GitHubInfo},
     repo::{cache::query_cache_commit, resources::RepoResources},
-    utils::push_empty_line,
+    utils::empty_or_start_new_line,
 };
 
 pub mod paths;
@@ -290,7 +290,7 @@ pub async fn merged_pr_to_commit(
     let comment = format!(
         "{title}{comment}",
         title = pr.title.as_deref().unwrap_or("untitled"),
-        comment = push_empty_line(&settings.notify.comment),
+        comment = empty_or_start_new_line(&settings.notify.comment),
     );
     let commit_settings = CommitSettings {
         url: Some(settings.url),

src/main.rs

@@ -372,9 +372,17 @@ async fn list_for_admin(bot: Bot, msg: &Message) -> Result<(), CommandError> {
 
     let repos = repo::list().await?;
     for repo in repos {
-        result.push('*');
+        result.push_str("\\- *");
         result.push_str(&markdown::escape(&repo));
         result.push_str("*\n");
+        let settings_json = {
+            let resources = repo::resources(&repo).await?;
+            let settings = resources.settings.read().await;
+            serde_json::to_string(&*settings).map_err(Error::Serde)?
+        };
+        result.push_str("  ");
+        result.push_str(&markdown::escape(&settings_json));
+        result.push('\n');
     }
     if result.is_empty() {
         result.push_str("(nothing)\n");
@@ -441,7 +449,7 @@ async fn list_for_normal(bot: Bot, msg: &Message) -> Result<(), CommandError> {
     if result.is_empty() {
         result.push_str("\\(nothing\\)\n");
     }
-    reply_to_msg(&bot, msg, result)
+    reply_to_msg(&bot, msg, markdown::expandable_blockquote(&result))
         .parse_mode(ParseMode::MarkdownV2)
         .disable_link_preview(true)
         .await?;

src/message.rs

@@ -10,7 +10,7 @@ use crate::{
     condition::Action,
     error::Error,
     repo::{pr_issue_url, resources::RepoResources},
-    utils::push_empty_line,
+    utils::empty_or_start_new_line,
 };
 
 pub fn commit_check_message(
@@ -75,7 +75,7 @@ pub fn commit_check_message_detail(
             .as_ref()
             .map(|u| format!("\n{}", markdown::escape(u.as_str())))
             .unwrap_or_default(),
-        notify = push_empty_line(&settings.notify.notify_markdown()),
+        notify = empty_or_start_new_line(&settings.notify.notify_markdown()),
         new = markdown_list(result.new.iter()),
         all = markdown_list(result.all.iter())
     )
@@ -98,7 +98,7 @@ pub async fn pr_issue_merged_message(
     Ok(format!(
         "{pretty_id} merged as `{commit}`{notify}",
         pretty_id = pr_issue_id_pretty(resources, id).await?,
-        notify = push_empty_line(&settings.notify.notify_markdown()),
+        notify = empty_or_start_new_line(&settings.notify.notify_markdown()),
     ))
 }
 
@@ -110,7 +110,7 @@ pub async fn pr_issue_closed_message(
     Ok(format!(
         "{pretty_id} has been closed{notify}",
         pretty_id = pr_issue_id_pretty(resources, id).await?,
-        notify = push_empty_line(&settings.notify.notify_markdown()),
+        notify = empty_or_start_new_line(&settings.notify.notify_markdown()),
     ))
 }
 
@@ -140,7 +140,7 @@ pub fn branch_check_message(
 ",
         repo = markdown::escape(repo),
         branch = markdown::escape(branch),
-        notify = push_empty_line(&settings.notify.notify_markdown()),
+        notify = empty_or_start_new_line(&settings.notify.notify_markdown()),
     )
 }
 

src/utils.rs

@@ -21,12 +21,12 @@ where
         .reply_parameters(ReplyParameters::new(msg.id))
 }
 
-pub fn push_empty_line(s: &str) -> String {
+pub fn empty_or_start_new_line(s: &str) -> String {
     let trimmed = s.trim().to_string();
     if trimmed.is_empty() {
         trimmed
     } else {
-        let mut result = "\n\n".to_string();
+        let mut result = "\n".to_string();
         result.push_str(&trimmed);
         result
     }