From cbea037968f850739538d9a8cec5d0af4b365981 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Tue, 27 Jun 2023 12:22:29 -0700
Subject: [PATCH] Adapt release notes generator to use merge state instead of
 bors (#654)

---
 generate-release/src/github_client.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/generate-release/src/github_client.rs b/generate-release/src/github_client.rs
index 3c5a66a05b..fba7ce953b 100644
--- a/generate-release/src/github_client.rs
+++ b/generate-release/src/github_client.rs
@@ -77,6 +77,11 @@ pub struct GithubUserSearchResponse {
     pub items: Vec<GithubUser>,
 }
 
+#[derive(Deserialize, Clone, Debug)]
+pub struct GithubIssuesResponsePullRequest {
+    pub merged_at: Option<String>,
+}
+
 #[derive(Deserialize, Clone, Debug)]
 pub struct GithubIssuesResponse {
     pub title: String,
@@ -85,6 +90,7 @@ pub struct GithubIssuesResponse {
     pub labels: Vec<GithubLabel>,
     pub user: GithubUser,
     pub closed_at: DateTime<Utc>,
+    pub pull_request: Option<GithubIssuesResponsePullRequest>,
 }
 
 pub struct GithubClient {
@@ -219,7 +225,12 @@ impl GithubClient {
         Ok(response
             .iter()
             // Make sure to only get the PRs that were merged by bors
-            .filter(|pr| pr.title.starts_with("[Merged by Bors] - "))
+            .filter(|pr| {
+                pr.pull_request
+                    .as_ref()
+                    .map(|pr| pr.merged_at.is_some())
+                    .unwrap_or(false)
+            })
             .cloned()
             .collect())
     }