Merge pull request #2264 from Urgau/gh-comments-ghost

Handle missing author in gh-comments by using the ghost account

Author: Urgau

src/gh_comments.rs

@@ -1,6 +1,6 @@
-use std::fmt::Write;
 use std::sync::Arc;
 use std::time::Instant;
+use std::{fmt::Write, sync::LazyLock};
 
 use anyhow::Context as _;
 use axum::{
@@ -47,6 +47,9 @@ impl cache::EstimatedSize for CachedComments {
     }
 }
 
+static GHOST_ACCOUNT: LazyLock<GitHubSimplifiedAuthor> =
+    LazyLock::new(GitHubSimplifiedAuthor::default);
+
 pub async fn gh_comments(
     Path(ref key @ (ref owner, ref repo, issue_id)): Path<(String, String, u64)>,
     State(ctx): State<Arc<Context>>,
@@ -114,8 +117,10 @@ pub async fn gh_comments(
                     std::mem::size_of::<GitHubGraphQlComment>()
                         + c.url.len()
                         + c.body_html.len()
-                        + c.author.login.len()
-                        + c.author.avatar_url.len()
+                        + c.author
+                            .as_ref()
+                            .map(|a| a.login.len() + a.avatar_url.len())
+                            .unwrap_or(0)
                 })
                 .sum::<usize>();
 
@@ -225,7 +230,10 @@ pub async fn gh_comments(
         &mut html,
         &issue_with_comments.body_html,
         &issue_with_comments.url,
-        &issue_with_comments.author,
+        issue_with_comments
+            .author
+            .as_ref()
+            .unwrap_or(&GHOST_ACCOUNT),
         &issue_with_comments.created_at,
         &issue_with_comments.updated_at,
         &issue_with_comments.reactions,
@@ -273,7 +281,7 @@ pub async fn gh_comments(
                         &mut html,
                         &comment.body_html,
                         &comment.url,
-                        &comment.author,
+                        comment.author.as_ref().unwrap_or(&GHOST_ACCOUNT),
                         &comment.created_at,
                         &comment.updated_at,
                         &comment.reactions,
@@ -288,7 +296,7 @@ pub async fn gh_comments(
                         &mut html,
                         &review.body_html,
                         &review.url,
-                        &review.author,
+                        review.author.as_ref().unwrap_or(&GHOST_ACCOUNT),
                         review.state,
                         &review.submitted_at,
                         &review.updated_at,
@@ -322,7 +330,7 @@ pub async fn gh_comments(
                 &mut html,
                 &comment.body_html,
                 &comment.url,
-                &comment.author,
+                comment.author.as_ref().unwrap_or(&GHOST_ACCOUNT),
                 &comment.created_at,
                 &comment.updated_at,
                 &comment.reactions,
@@ -616,8 +624,9 @@ fn write_review_thread_as_html(
     )?;
 
     for comment in comments {
-        let author_login = &comment.author.login;
-        let author_avatar_url = &comment.author.avatar_url;
+        let author = comment.author.as_ref().unwrap_or(&GHOST_ACCOUNT);
+        let author_login = &author.login;
+        let author_avatar_url = &author.avatar_url;
         let created_at = &comment.created_at;
         let created_at_rfc3339 = comment.created_at.to_rfc3339();
         let body_html = &comment.body_html;

src/github.rs

@@ -3187,7 +3187,7 @@ pub struct GitHubIssueWithComments {
     pub body_html: String,
     pub state: GitHubIssueState,
     pub url: String,
-    pub author: GitHubSimplifiedAuthor,
+    pub author: Option<GitHubSimplifiedAuthor>,
     #[serde(rename = "createdAt")]
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[serde(rename = "updatedAt")]
@@ -3207,14 +3207,24 @@ pub struct GitHubSimplifiedAuthor {
     pub avatar_url: String,
 }
 
+impl Default for GitHubSimplifiedAuthor {
+    fn default() -> Self {
+        // Default to the "Deleted user" (https://github.com/ghost)
+        GitHubSimplifiedAuthor {
+            login: "ghost".to_string(),
+            avatar_url: "https://avatars.githubusercontent.com/u/10137?v=4".to_string(),
+        }
+    }
+}
+
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct GitHubGraphQlComments {
     pub nodes: Vec<GitHubGraphQlComment>,
 }
 
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct GitHubGraphQlComment {
-    pub author: GitHubSimplifiedAuthor,
+    pub author: Option<GitHubSimplifiedAuthor>,
     #[serde(rename = "createdAt")]
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[serde(rename = "updatedAt")]
@@ -3254,7 +3264,7 @@ pub struct GitHubGraphQlReviewThreadComments {
 
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct GitHubGraphQlReviewThreadComment {
-    pub author: GitHubSimplifiedAuthor,
+    pub author: Option<GitHubSimplifiedAuthor>,
     #[serde(rename = "createdAt")]
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[serde(rename = "updatedAt")]
@@ -3280,7 +3290,7 @@ pub struct GitHubGraphQlReviews {
 
 #[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct GitHubGraphQlReview {
-    pub author: GitHubSimplifiedAuthor,
+    pub author: Option<GitHubSimplifiedAuthor>,
     pub id: String,
     pub state: GitHubReviewState,
     #[serde(rename = "submittedAt")]