Merge pull request #1800 from ehuss/webhook-deserialize-fix

Fix some webhook deserialization errors.

Author: jackh726

Cargo.lock

@@ -28,7 +28,7 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 url = "2.1.0"
 once_cell = "1"
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { version = "0.4.38", features = ["serde"] }
 tokio-postgres = { version = "0.7.2", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-0_8"] }
 postgres-native-tls = "0.5.0"
 native-tls = "0.2"

Cargo.toml

@@ -363,9 +363,9 @@ pub struct Comment {
     pub body: String,
     pub html_url: String,
     pub user: User,
-    #[serde(alias = "submitted_at")] // for pull request reviews
+    #[serde(default, alias = "submitted_at")] // for pull request reviews
     pub created_at: chrono::DateTime<Utc>,
-    #[serde(alias = "submitted_at")] // for pull request reviews
+    #[serde(default, alias = "submitted_at")] // for pull request reviews
     pub updated_at: chrono::DateTime<Utc>,
     #[serde(default, rename = "state")]
     pub pr_review_state: Option<PullRequestReviewState>,
@@ -983,14 +983,18 @@ pub enum IssuesAction {
     Demilestoned,
     ReviewRequested {
         /// The person requested to review the pull request
-        requested_reviewer: User,
+        ///
+        /// This can be `None` when a review is requested for a team.
+        requested_reviewer: Option<User>,
     },
     ReviewRequestRemoved,
     ReadyForReview,
     Synchronize,
     ConvertedToDraft,
     AutoMergeEnabled,
     AutoMergeDisabled,
+    Enqueued,
+    Dequeued,
 }
 
 #[derive(Debug, serde::Deserialize)]

src/github.rs

@@ -15,7 +15,10 @@ pub(crate) async fn parse_input(
         return Ok(None);
     }
 
-    let IssuesAction::ReviewRequested { requested_reviewer } = &event.action else {
+    let IssuesAction::ReviewRequested {
+        requested_reviewer: Some(requested_reviewer),
+    } = &event.action
+    else {
         return Ok(None);
     };
 

src/handlers/review_requested.rs

@@ -163,6 +163,7 @@ pub fn deserialize_payload<T: serde::de::DeserializeOwned>(v: &str) -> anyhow::R
     match res {
         Ok(r) => Ok(r),
         Err(e) => {
+            log::error!("failed to deserialize webhook payload: {v}");
             let ctx = format!("at {:?}", e.path());
             Err(e.into_inner()).context(ctx)
         }
@@ -184,7 +185,7 @@ pub async fn webhook(
             payload.pull_request.pull_request = Some(PullRequestDetails::new());
 
             // Treat pull request review comments exactly like pull request
-            // review comments.
+            // comments.
             github::Event::IssueComment(github::IssueCommentEvent {
                 action: match payload.action {
                     github::PullRequestReviewAction::Submitted => {