fix(github): fix implementation for pr merge

koishijs · Sep 9, 2020 · ffc8a1e · ffc8a1e
1 parent cf00713
commit ffc8a1e
Show file tree

Hide file tree

Showing 4 changed files with 523 additions and 5 deletions.
diff --git a/packages/plugin-github/src/events.ts b/packages/plugin-github/src/events.ts
@@ -204,12 +204,12 @@ export function addListeners(on: <T extends EventNames.All>(event: T, handler: E
     ].join('\n'), { link: html_url, reply: [comments_url] }]
   })
 
-  on('pull_request.closed', ({ repository, pull_request }) => {
+  on('pull_request.closed', ({ repository, pull_request, sender }) => {
     const { full_name } = repository
-    const { user, html_url, issue_url, comments_url, title, number } = pull_request
-    if (user.type === 'Bot') return
+    const { html_url, issue_url, comments_url, title, number, merged } = pull_request
 
-    return [`[GitHub] ${user.login} closed pull request ${full_name}#${number}\n${title}`, {
+    const type = merged ? 'merged' : 'closed'
+    return [`[GitHub] ${sender.login} ${type} pull request ${full_name}#${number}\n${title}`, {
       link: html_url,
       react: issue_url + '/reactions',
       reply: [comments_url],

diff --git a/...b/tests/fixtures/pull_request.closed.json → ...tests/fixtures/pull_request.closed.1.json b/...b/tests/fixtures/pull_request.closed.json → ...tests/fixtures/pull_request.closed.1.json