diff --git a/src/index.ts b/src/index.ts index 2209d6d..7359e78 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,11 +22,7 @@ const octokit = new Octokit({ module.exports = (app: Probot) => { app.on("push", async (context) => { - let event1: string; - let event2: string; - let event3: string; - let event4: string; - let event5: string; + let event1: string, event2: string, event3: string, event4: string, event5: string; async function userActivity() { const arrayActivity: getUserData = {"userData": []}; await fetch('https://api.github.com/users/Muunatic/events/public', { @@ -193,9 +189,9 @@ module.exports = (app: Probot) => { app.on("pull_request.opened", async (context) => { if (context.payload.sender.type == "User") { if (context.payload.sender.login != context.payload.repository.owner.login) { - if (context.payload.repository.html_url == "https://github.com/Muunatic/github-AutoResponse") { + if (context.payload.repository.html_url == "https://github.com/Typeslint/github-AutoResponse") { await context.octokit.pulls.listFiles({ - owner: 'Muunatic', + owner: 'Typeslint', repo: 'github-AutoResponse', pull_number: context.payload.number }).then((res) => { @@ -215,13 +211,13 @@ module.exports = (app: Probot) => { ); let shaRef: string; await octokit.rest.pulls.get({ - owner: 'Muunatic', + owner: 'Typeslint', repo: 'github-AutoResponse', pull_number: context.payload.number }).then(async (res) => { shaRef = res.data.head.sha; await octokit.rest.repos.getContent({ - owner: 'Muunatic', + owner: 'Typeslint', repo: 'github-AutoResponse', ref: shaRef, path: "tsconfig.json" @@ -586,16 +582,16 @@ module.exports = (app: Probot) => { // re-requested reviewer app.on("pull_request.synchronize", async (context) => { if (context.payload.pull_request.user.type == "User") { - if (context.payload.repository.homepage == "https://github.com/Muunatic/github-AutoResponse") { + if (context.payload.repository.homepage == "https://github.com/Typeslint/github-AutoResponse") { let shaRef: string; await octokit.rest.pulls.get({ - owner: 'Muunatic', + owner: 'Typeslint', repo: 'github-AutoResponse', pull_number: context.payload.number }).then(async (res) => { shaRef = res.data.head.sha; await octokit.rest.repos.getContent({ - owner: 'Muunatic', + owner: 'Typeslint', repo: 'github-AutoResponse', ref: shaRef, path: "tsconfig.json" @@ -782,132 +778,132 @@ module.exports = (app: Probot) => { if (context.payload.comment.user.type == "User") { switch (context.payload.issue.user.type) { case "User": - // Merge pull request - if (context.payload.comment.body.toLowerCase() == "ready to merge") { - if (context.payload.issue.user.login == context.payload.comment.user.login) { - let i: number; - for (i = 0; i < context.payload.issue.labels.length; i++) { - if (context.payload.issue.labels[i].name == "Approved") { - console.log("Merging"); - await context.octokit.pulls.merge({ - repo: context.payload.repository.name, - owner: context.payload.repository.owner.login, - pull_number: context.payload.issue.number, - commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, - commit_message: context.payload.issue.title - }); - console.log("Merged!"); - await context.octokit.issues.createComment( - context.issue({ - body: `Merged by ${context.payload.comment.user.login}!` - }) - ); - break; - } else if (context.payload.issue.labels[i].name == "Requested Changes") { - console.log('PRs Blocked'); - await context.octokit.issues.createComment( - context.issue({ - body: `Merging blocked because PRs has requested changes! @${context.payload.comment.user.login}` - }) - ); - break; - } else { - continue; - } + // Merge pull request + if (context.payload.comment.body.toLowerCase() == "ready to merge") { + if (context.payload.issue.user.login == context.payload.comment.user.login) { + let i: number; + for (i = 0; i < context.payload.issue.labels.length; i++) { + if (context.payload.issue.labels[i].name == "Approved") { + console.log("Merging"); + await context.octokit.pulls.merge({ + repo: context.payload.repository.name, + owner: context.payload.repository.owner.login, + pull_number: context.payload.issue.number, + commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, + commit_message: context.payload.issue.title + }); + console.log("Merged!"); + await context.octokit.issues.createComment( + context.issue({ + body: `Merged by ${context.payload.comment.user.login}!` + }) + ); + break; + } else if (context.payload.issue.labels[i].name == "Requested Changes") { + console.log('PRs Blocked'); + await context.octokit.issues.createComment( + context.issue({ + body: `Merging blocked because PRs has requested changes! @${context.payload.comment.user.login}` + }) + ); + break; + } else { + continue; } - } else { - return; } + } else { + return; } + } - if (context.payload.comment.body.toLowerCase() == "merge") { - if (context.payload.sender.login == context.payload.repository.owner.login) { - await context.octokit.pulls.merge({ - repo: context.payload.repository.name, - owner: context.payload.repository.owner.login, - pull_number: context.payload.issue.number, - commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, - commit_message: context.payload.issue.title - }); - console.log("Merged!"); - await context.octokit.issues.removeLabel( - context.issue({ - name: 'Pending' - }) - ); - await context.octokit.issues.createComment( - context.issue({ - body: `Merged by \`[OWNER]\`${context.payload.comment.user.login}!` - }) - ); - await context.octokit.issues.addLabels( - context.issue({ - labels: ['Owner Merge'] - }) - ); - } else { - return; - } + if (context.payload.comment.body.toLowerCase() == "merge") { + if (context.payload.sender.login == context.payload.repository.owner.login) { + await context.octokit.pulls.merge({ + repo: context.payload.repository.name, + owner: context.payload.repository.owner.login, + pull_number: context.payload.issue.number, + commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, + commit_message: context.payload.issue.title + }); + console.log("Merged!"); + await context.octokit.issues.removeLabel( + context.issue({ + name: 'Pending' + }) + ); + await context.octokit.issues.createComment( + context.issue({ + body: `Merged by \`[OWNER]\`${context.payload.comment.user.login}!` + }) + ); + await context.octokit.issues.addLabels( + context.issue({ + labels: ['Owner Merge'] + }) + ); + } else { + return; } + } break; case "Bot": - // Merge pull request - if (context.payload.comment.body.toLowerCase() == "ready to merge") { - if (context.payload.issue.user.login == context.payload.comment.user.login) { - let i: number; - for (i = 0; i < context.payload.issue.labels.length; i++) { - if (context.payload.issue.labels[i].name == "Approved") { - console.log("Merging"); - await context.octokit.pulls.merge({ - repo: context.payload.repository.name, - owner: context.payload.repository.owner.login, - pull_number: context.payload.issue.number, - commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, - commit_message: context.payload.issue.title - }); - console.log("Merged!"); - await context.octokit.issues.createComment( - context.issue({ - body: `Merged by ${context.payload.comment.user.login}!` - }) - ); - break; - } else if (context.payload.issue.labels[i].name == "Requested Changes") { - console.log('PRs Blocked'); - await context.octokit.issues.createComment( - context.issue({ - body: `Merging blocked because PRs has requested changes! @${context.payload.comment.user.login}` - }) - ); - break; - } else { - continue; - } + // Merge pull request + if (context.payload.comment.body.toLowerCase() == "ready to merge") { + if (context.payload.issue.user.login == context.payload.comment.user.login) { + let i: number; + for (i = 0; i < context.payload.issue.labels.length; i++) { + if (context.payload.issue.labels[i].name == "Approved") { + console.log("Merging"); + await context.octokit.pulls.merge({ + repo: context.payload.repository.name, + owner: context.payload.repository.owner.login, + pull_number: context.payload.issue.number, + commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, + commit_message: context.payload.issue.title + }); + console.log("Merged!"); + await context.octokit.issues.createComment( + context.issue({ + body: `Merged by ${context.payload.comment.user.login}!` + }) + ); + break; + } else if (context.payload.issue.labels[i].name == "Requested Changes") { + console.log('PRs Blocked'); + await context.octokit.issues.createComment( + context.issue({ + body: `Merging blocked because PRs has requested changes! @${context.payload.comment.user.login}` + }) + ); + break; + } else { + continue; } - } else { - return; } + } else { + return; } + } - if (context.payload.comment.body.toLowerCase() == "merge") { - if (context.payload.sender.login == context.payload.repository.owner.login) { - await context.octokit.pulls.merge({ - repo: context.payload.repository.name, - owner: context.payload.repository.owner.login, - pull_number: context.payload.issue.number, - commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, - commit_message: context.payload.issue.title - }); - console.log("Merged!"); - await context.octokit.issues.createComment( - context.issue({ - body: `Merged by ${context.payload.comment.user.login}!` - }) - ); - } else { - return; - } + if (context.payload.comment.body.toLowerCase() == "merge") { + if (context.payload.sender.login == context.payload.repository.owner.login) { + await context.octokit.pulls.merge({ + repo: context.payload.repository.name, + owner: context.payload.repository.owner.login, + pull_number: context.payload.issue.number, + commit_title: `Merge PR #${context.payload.issue.number} ${context.payload.issue.title}`, + commit_message: context.payload.issue.title + }); + console.log("Merged!"); + await context.octokit.issues.createComment( + context.issue({ + body: `Merged by ${context.payload.comment.user.login}!` + }) + ); + } else { + return; } + } break; default: break;