From aadaae159275efc7470d0f99921a94c529328ea3 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Mon, 29 Jun 2026 18:28:01 +0100
Subject: [PATCH] remove requests that are no longer warranted

---
 dist/index.js | 13 +++++++++++++
 src/index.ts  | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dist/index.js b/dist/index.js
index ab3778f..c6fcfdb 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -33244,6 +33244,19 @@ async function run() {
             info('No reviewers to call');
             return;
         }
+        //Remove review requests from users no longer impacted
+        const currentlyRequested = (response.data.requested_reviewers ?? []).map(r => r.login);
+        const allCodeowners = Array.from(codeowners.keys()).map(o => o.replace('@', ''));
+        const toRemove = currentlyRequested.filter(r => !trimmed_owners.includes(r) && allCodeowners.includes(r));
+        if (toRemove.length) {
+            info(`Removing review requests from: ${toRemove.join(', ')}`);
+            await octokit.rest.pulls.removeRequestedReviewers({
+                owner: core_owner,
+                repo: core_repo,
+                pull_number: pull_number,
+                reviewers: toRemove
+            });
+        }
         //Finally notify all users for review
         await octokit.rest.pulls.requestReviewers({
             owner: core_owner,
diff --git a/src/index.ts b/src/index.ts
index be711e1..7a3c3d4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -189,6 +189,27 @@ async function run(): Promise<void> {
             return
         }
 
+        //Remove review requests from users no longer impacted
+        const currentlyRequested: string[] = (
+            response.data.requested_reviewers ?? []
+        ).map(r => r.login)
+        const allCodeowners = Array.from(codeowners.keys()).map(o =>
+            o.replace('@', '')
+        )
+        const toRemove = currentlyRequested.filter(
+            r => !trimmed_owners.includes(r) && allCodeowners.includes(r)
+        )
+
+        if (toRemove.length) {
+            info(`Removing review requests from: ${toRemove.join(', ')}`)
+            await octokit.rest.pulls.removeRequestedReviewers({
+                owner: core_owner,
+                repo: core_repo,
+                pull_number: pull_number,
+                reviewers: toRemove
+            })
+        }
+
         //Finally notify all users for review
         await octokit.rest.pulls.requestReviewers({
             owner: core_owner,