Fetch issues for duplicate check properly

tachiyomiorg · Mar 25, 2023 · 5001d01 · 5001d01
1 parent bb7fa55
commit 5001d01
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,10 +22,10 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           duplicate-check-enabled: true
           duplicate-check-labels: |
-            ["enhancement"]
+            ["enhancement", "question"]
           existing-check-enabled: true
           existing-check-labels: |
-            ["enhancement"]
+            ["enhancement", "question"]
           auto-close-rules: |
             [
               {

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/feature/dupe-check.ts b/src/feature/dupe-check.ts
@@ -31,7 +31,7 @@ export async function checkForDuplicates() {
     labelsToCheck = [core.getInput('duplicate-check-label')];
   }
 
-  const hasRelevantLabel = issue.labels?.find((label) =>
+  const hasRelevantLabel = issue.labels?.some((label) =>
     labelsToCheck.includes(label.name),
   );
   if (!hasRelevantLabel) {
@@ -51,13 +51,18 @@ export async function checkForDuplicates() {
 
   const { repo } = github.context;
 
-  const allOpenIssues = await client.paginate(client.rest.issues.listForRepo, {
-    owner: repo.owner,
-    repo: repo.repo,
-    state: 'open',
-    labels: labelsToCheck.join(','),
-    per_page: 100,
-  });
+  const results = await Promise.all(
+    labelsToCheck.map((label) =>
+      client.paginate(client.rest.issues.listForRepo, {
+        owner: repo.owner,
+        repo: repo.repo,
+        state: 'open',
+        labels: label,
+        per_page: 100,
+      }),
+    ),
+  );
+  const allOpenIssues = results.flat();
 
   const duplicateIssues = allOpenIssues
     .map((currIssue) => ({

diff --git a/src/feature/existing-check.ts b/src/feature/existing-check.ts
@@ -42,7 +42,7 @@ export async function checkForExisting() {
     labelsToCheck = [core.getInput('existing-check-label')];
   }
 
-  const hasRelevantLabel = issue.labels?.find((label) =>
+  const hasRelevantLabel = issue.labels?.some((label) =>
     labelsToCheck.includes(label.name),
   );
   if (!hasRelevantLabel) {