From 9e32e9d05cb57c8b48b559da1ff75412f95b84e9 Mon Sep 17 00:00:00 2001 From: gitcommitshow <56937085+gitcommitshow@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:49:32 +0000 Subject: [PATCH 1/2] fix: missing parameter in merge message requirement check --- app.js | 2 +- src/helpers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 4bf04ca..39e8caa 100644 --- a/app.js +++ b/app.js @@ -101,7 +101,7 @@ app.webhooks.on("pull_request.closed", async ({ octokit, payload }) => { if (!payload.pull_request.merged) return; console.log(`This PR is merged`); try { - if (!isMessageAfterMergeRequired()) { + if (!isMessageAfterMergeRequired(payload.pull_request)) { return; } console.log(`Going to notify the PR author...`); diff --git a/src/helpers.js b/src/helpers.js index 7c1cecb..853661a 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -41,7 +41,7 @@ export function isCLARequired(pullRequest) { } export function isMessageAfterMergeRequired(pullRequest) { - if (isABot(pullRequest.user)) { + if (isABot(pullRequest?.user)) { console.log("This PR is from a bot. So no message after merge required."); return false; } From 394fef8d66652528bc2502d99d83669591137feb Mon Sep 17 00:00:00 2001 From: gitcommitshow <56937085+gitcommitshow@users.noreply.github.com> Date: Sat, 22 Jun 2024 15:05:37 +0000 Subject: [PATCH 2/2] fix: incorrect references of pr in issue created event --- app.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index 39e8caa..227ca3c 100644 --- a/app.js +++ b/app.js @@ -56,7 +56,7 @@ app.octokit.log.debug(`Authenticated as '${data.name}'`); // Subscribe to the "pull_request.opened" webhook event app.webhooks.on("pull_request.opened", async ({ octokit, payload }) => { console.log( - `Received a pull request event for #${payload.pull_request.number}`, + `Received a pull request event for #${payload.pull_request.number} by ${payload.pull_request.user.type}: ${payload.pull_request.user.login}`, ); try { if (!isCLARequired(payload.pull_request)) { @@ -129,9 +129,7 @@ app.webhooks.on("pull_request.closed", async ({ octokit, payload }) => { }); app.webhooks.on("issues.opened", async ({ octokit, payload }) => { - console.log( - `Received a new issue event for #${payload.issue.number} by ${pull_request.user.type}: ${pull_request.user.login}`, - ); + console.log(`Received a new issue event for #${payload.issue.number}`); try { await octokit.rest.issues.createComment({ owner: payload.repository.owner.login,