Skip to content

Commit 03e9f4c

Browse files
fix: missing parameter in merge message requirement check (#22)
1 parent 40a138d commit 03e9f4c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

app.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ app.octokit.log.debug(`Authenticated as '${data.name}'`);
5656
// Subscribe to the "pull_request.opened" webhook event
5757
app.webhooks.on("pull_request.opened", async ({ octokit, payload }) => {
5858
console.log(
59-
`Received a pull request event for #${payload.pull_request.number}`,
59+
`Received a pull request event for #${payload.pull_request.number} by ${payload.pull_request.user.type}: ${payload.pull_request.user.login}`,
6060
);
6161
try {
6262
if (!isCLARequired(payload.pull_request)) {
@@ -101,7 +101,7 @@ app.webhooks.on("pull_request.closed", async ({ octokit, payload }) => {
101101
if (!payload.pull_request.merged) return;
102102
console.log(`This PR is merged`);
103103
try {
104-
if (!isMessageAfterMergeRequired()) {
104+
if (!isMessageAfterMergeRequired(payload.pull_request)) {
105105
return;
106106
}
107107
console.log(`Going to notify the PR author...`);
@@ -129,9 +129,7 @@ app.webhooks.on("pull_request.closed", async ({ octokit, payload }) => {
129129
});
130130

131131
app.webhooks.on("issues.opened", async ({ octokit, payload }) => {
132-
console.log(
133-
`Received a new issue event for #${payload.issue.number} by ${pull_request.user.type}: ${pull_request.user.login}`,
134-
);
132+
console.log(`Received a new issue event for #${payload.issue.number}`);
135133
try {
136134
await octokit.rest.issues.createComment({
137135
owner: payload.repository.owner.login,

src/helpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function isCLARequired(pullRequest) {
4141
}
4242

4343
export function isMessageAfterMergeRequired(pullRequest) {
44-
if (isABot(pullRequest.user)) {
44+
if (isABot(pullRequest?.user)) {
4545
console.log("This PR is from a bot. So no message after merge required.");
4646
return false;
4747
}

0 commit comments

Comments
 (0)