From 35d582445bf467bf03f8a89e9c8f34ee21ad8339 Mon Sep 17 00:00:00 2001
From: Julien Bouyoud <jBouyoud@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:25:55 +0200
Subject: [PATCH] fix: handle Github API deprecations

Fix: https://github.com/intuit/auto/issues/2501
---
 packages/core/src/__tests__/git.test.ts | 5 +++--
 packages/core/src/git.ts                | 3 ++-
 packages/core/src/release.ts            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/__tests__/git.test.ts b/packages/core/src/__tests__/git.test.ts
index 19838548a..882778fa3 100644
--- a/packages/core/src/__tests__/git.test.ts
+++ b/packages/core/src/__tests__/git.test.ts
@@ -378,12 +378,13 @@ describe("github", () => {
 
     issuesAndPullRequests.mockReturnValueOnce({ data: true });
     await gh.searchRepo({
-      q: "is:pr is:open",
+      q: "is:pr AND is:open",
       order: "desc",
     });
 
     expect(issuesAndPullRequests).toHaveBeenCalledWith({
-      q: "repo:Adam Dierkens/test is:pr is:open",
+      advanced_search: true,
+      q: "repo:Adam Dierkens/test AND (is:pr AND is:open)",
       order: "desc",
     });
   });
diff --git a/packages/core/src/git.ts b/packages/core/src/git.ts
index 09dccc6e2..233f07aa9 100644
--- a/packages/core/src/git.ts
+++ b/packages/core/src/git.ts
@@ -518,7 +518,8 @@ export default class Git {
     options: RestEndpointMethodTypes["search"]["issuesAndPullRequests"]["parameters"]
   ) {
     const repo = `repo:${this.options.owner}/${this.options.repo}`;
-    options.q = `${repo} ${options.q}`;
+    options.q = `${repo} AND (${options.q})`;
+    options.advanced_search = true;
 
     this.logger.verbose.info("Searching repo using:\n", options);
 
diff --git a/packages/core/src/release.ts b/packages/core/src/release.ts
index 4fa00906d..aafb44b91 100644
--- a/packages/core/src/release.ts
+++ b/packages/core/src/release.ts
@@ -471,7 +471,7 @@ export default class Release {
     }
 
     const prsSinceLastRelease = await this.git.searchRepo({
-      q: `is:pr is:merged merged:>=${lastRelease.published_at}`,
+      q: `is:pr AND is:merged AND merged:>=${lastRelease.published_at}`,
     });
 
     if (!prsSinceLastRelease || !prsSinceLastRelease.items) {