Fix stale closing logic by removing close date addition

dist/index.js

@@ -8755,39 +8755,27 @@ class IssueProcessor {
     listIssueComments(issueNumber, sinceDate) {
         return __awaiter(this, void 0, void 0, function* () {
             // find any comments since date on the given issue
-            try {
+            const comments = yield this.client.issues.listComments({
-                const comments = yield this.client.issues.listComments({
+                owner: github.context.repo.owner,
-                    owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
-                    repo: github.context.repo.repo,
+                issue_number: issueNumber,
-                    issue_number: issueNumber,
+                since: sinceDate
-                    since: sinceDate
+            });
-                });
+            return comments.data;
-                return comments.data;
-            }
-            catch (error) {
-                core.error(`List issue comments error: ${error.message}`);
-                return Promise.resolve([]);
-            }
         });
     }
     // grab issues from github in baches of 100
     getIssues(page) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
+            const issueResult = yield this.client.issues.listForRepo({
-                const issueResult = yield this.client.issues.listForRepo({
+                owner: github.context.repo.owner,
-                    owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
-                    repo: github.context.repo.repo,
+                state: 'open',
-                    state: 'open',
+                labels: this.options.onlyLabels,
-                    labels: this.options.onlyLabels,
+                per_page: 100,
-                    per_page: 100,
+                page
-                    page
+            });
-                });
+            return issueResult.data;
-                return issueResult.data;
-            }
-            catch (error) {
-                core.error(`Get issues for repo error: ${error.message}`);
-                return Promise.resolve([]);
-            }
         });
     }
     // Mark an issue as stale with a comment and a label
@@ -8803,28 +8791,18 @@ class IssueProcessor {
             if (this.options.debugOnly) {
                 return;
             }
-            try {
+            yield this.client.issues.createComment({
-                yield this.client.issues.createComment({
+                owner: github.context.repo.owner,
-                    owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
-                    repo: github.context.repo.repo,
+                issue_number: issue.number,
-                    issue_number: issue.number,
+                body: staleMessage
-                    body: staleMessage
+            });
-                });
+            yield this.client.issues.addLabels({
-            }
+                owner: github.context.repo.owner,
-            catch (error) {
+                repo: github.context.repo.repo,
-                core.error(`Error creating a comment: ${error.message}`);
+                issue_number: issue.number,
-            }
+                labels: [staleLabel]
-            try {
+            });
-                yield this.client.issues.addLabels({
-                    owner: github.context.repo.owner,
-                    repo: github.context.repo.repo,
-                    issue_number: issue.number,
-                    labels: [staleLabel]
-                });
-            }
-            catch (error) {
-                core.error(`Error adding a label: ${error.message}`);
-            }
         });
     }
     // Close an issue based on staleness
@@ -8836,17 +8814,12 @@ class IssueProcessor {
             if (this.options.debugOnly) {
                 return;
             }
-            try {
+            yield this.client.issues.update({
-                yield this.client.issues.update({
+                owner: github.context.repo.owner,
-                    owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
-                    repo: github.context.repo.repo,
+                issue_number: issue.number,
-                    issue_number: issue.number,
+                state: 'closed'
-                    state: 'closed'
+            });
-                });
-            }
-            catch (error) {
-                core.error(`Error updating an issue: ${error.message}`);
-            }
         });
     }
     // Remove a label from an issue
@@ -8858,17 +8831,12 @@ class IssueProcessor {
             if (this.options.debugOnly) {
                 return;
             }
-            try {
+            yield this.client.issues.removeLabel({
-                yield this.client.issues.removeLabel({
+                owner: github.context.repo.owner,
-                    owner: github.context.repo.owner,
+                repo: github.context.repo.repo,
-                    repo: github.context.repo.repo,
+                issue_number: issue.number,
-                    issue_number: issue.number,
+                name: encodeURIComponent(label) // A label can have a "?" in the name
-                    name: encodeURIComponent(label) // A label can have a "?" in the name
+            });
-                });
-            }
-            catch (error) {
-                core.error(`Error removing a label: ${error.message}`);
-            }
         });
     }
     // returns the creation date of a given label on an issue (or nothing if no label existed)

src/IssueProcessor.ts

@@ -268,38 +268,28 @@ export class IssueProcessor {
     sinceDate: string
   ): Promise<Comment[]> {
     // find any comments since date on the given issue
-    try {
+    const comments = await this.client.issues.listComments({
-      const comments = await this.client.issues.listComments({
+      owner: github.context.repo.owner,
-        owner: github.context.repo.owner,
+      repo: github.context.repo.repo,
-        repo: github.context.repo.repo,
+      issue_number: issueNumber,
-        issue_number: issueNumber,
+      since: sinceDate
-        since: sinceDate
+    });
-      });
+
-      return comments.data;
+    return comments.data;
-    } catch (error) {
-      core.error(`List issue comments error: ${error.message}`);
-      return Promise.resolve([]);
-    }
   }
 
   // grab issues from github in baches of 100
   private async getIssues(page: number): Promise<Issue[]> {
-    try {
+    const issueResult: OctoKitIssueList = await this.client.issues.listForRepo({
-      const issueResult: OctoKitIssueList = await this.client.issues.listForRepo(
+      owner: github.context.repo.owner,
-        {
+      repo: github.context.repo.repo,
-          owner: github.context.repo.owner,
+      state: 'open',
-          repo: github.context.repo.repo,
+      labels: this.options.onlyLabels,
-          state: 'open',
+      per_page: 100,
-          labels: this.options.onlyLabels,
+      page
-          per_page: 100,
+    });
-          page
+
-        }
+    return issueResult.data;
-      );
-      return issueResult.data;
-    } catch (error) {
-      core.error(`Get issues for repo error: ${error.message}`);
-      return Promise.resolve([]);
-    }
   }
 
   // Mark an issue as stale with a comment and a label
@@ -323,27 +313,19 @@ export class IssueProcessor {
       return;
     }
 
-    try {
+    await this.client.issues.createComment({
-      await this.client.issues.createComment({
+      owner: github.context.repo.owner,
-        owner: github.context.repo.owner,
+      repo: github.context.repo.repo,
-        repo: github.context.repo.repo,
+      issue_number: issue.number,
-        issue_number: issue.number,
+      body: staleMessage
-        body: staleMessage
+    });
-      });
-    } catch (error) {
-      core.error(`Error creating a comment: ${error.message}`);
-    }
 
-    try {
+    await this.client.issues.addLabels({
-      await this.client.issues.addLabels({
+      owner: github.context.repo.owner,
-        owner: github.context.repo.owner,
+      repo: github.context.repo.repo,
-        repo: github.context.repo.repo,
+      issue_number: issue.number,
-        issue_number: issue.number,
+      labels: [staleLabel]
-        labels: [staleLabel]
+    });
-      });
-    } catch (error) {
-      core.error(`Error adding a label: ${error.message}`);
-    }
   }
 
   // Close an issue based on staleness
@@ -360,16 +342,12 @@ export class IssueProcessor {
       return;
     }
 
-    try {
+    await this.client.issues.update({
-      await this.client.issues.update({
+      owner: github.context.repo.owner,
-        owner: github.context.repo.owner,
+      repo: github.context.repo.repo,
-        repo: github.context.repo.repo,
+      issue_number: issue.number,
-        issue_number: issue.number,
+      state: 'closed'
-        state: 'closed'
+    });
-      });
-    } catch (error) {
-      core.error(`Error updating an issue: ${error.message}`);
-    }
   }
 
   // Remove a label from an issue
@@ -386,16 +364,12 @@ export class IssueProcessor {
       return;
     }
 
-    try {
+    await this.client.issues.removeLabel({
-      await this.client.issues.removeLabel({
+      owner: github.context.repo.owner,
-        owner: github.context.repo.owner,
+      repo: github.context.repo.repo,
-        repo: github.context.repo.repo,
+      issue_number: issue.number,
-        issue_number: issue.number,
+      name: encodeURIComponent(label) // A label can have a "?" in the name
-        name: encodeURIComponent(label) // A label can have a "?" in the name
+    });
-      });
-    } catch (error) {
-      core.error(`Error removing a label: ${error.message}`);
-    }
   }
 
   // returns the creation date of a given label on an issue (or nothing if no label existed)