Merge pull request #37 from guardian/aa/bot-refinement

feat: Use emoji to signal bot or human user
guardian · Oct 23, 2024 · 3422cbc · 3422cbc
2 parents ffc4f08 + b08480d
commit 3422cbc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/github.rs b/src/github.rs
@@ -36,6 +36,7 @@ pub struct GithubLabel {
 pub struct GithubUser {
     pub id: usize,
     pub login: String,
+    pub r#type: String,
 }
 
 #[derive(Deserialize, Debug)]

diff --git a/src/main.rs b/src/main.rs
@@ -205,15 +205,8 @@ async fn main() -> Result<(), Error> {
 }
 
 fn make_message(pull_request: GithubPullRequest, show_pr_age: bool) -> String {
-    let prefix = if pull_request.user.login.contains("[bot]") {
-        "🤖🤖🤖 ".to_string()
-    } else {
-        "".to_string()
-    };
-
     let message = format!(
-        "{}<{}|{}#{}> - {}",
-        prefix,
+        "<{}|{}#{}> - {}",
         pull_request.html_url.replace("https://", ""),
         pull_request.head.repo.name,
         pull_request.number,
@@ -226,10 +219,13 @@ fn make_message(pull_request: GithubPullRequest, show_pr_age: bool) -> String {
         "".to_string()
     };
 
-    format!(
-        "{}{} \n\nby {}\n",
-        message, age_output, pull_request.user.login
-    )
+    let user = if pull_request.user.r#type.to_lowercase() == "bot" {
+        format!("🤖 {}", pull_request.user.login)
+    } else {
+        format!("👤 {}", pull_request.user.login)
+    };
+
+    format!("{}{} \n\n{}\n", message, age_output, user)
 }
 
 fn get_age(d1: DateTime<Utc>, d2: DateTime<Utc>) -> String {