[slack] Modify getCommit method option if event name is pull request

lazy-actions · Nov 21, 2019 · 57775e9 · 57775e9
1 parent 5879c19
commit 57775e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -11016,9 +11016,11 @@ class Block {
     getCommitFields(token) {
         return __awaiter(this, void 0, void 0, function* () {
             const { owner, repo } = this.context.repo;
-            const { sha } = this.context;
+            const ref = this.isPullRequest
+                ? this.context.ref.replace(/refs\/heads\//, '')
+                : this.context.sha;
             const client = new github.GitHub(token);
-            const { data: commit } = yield client.repos.getCommit({ owner, repo, ref: sha });
+            const { data: commit } = yield client.repos.getCommit({ owner, repo, ref });
             const authorName = commit.author.login;
             const authorUrl = commit.author.html_url;
             const commitMsg = commit.commit.message;

diff --git a/src/slack.ts b/src/slack.ts
@@ -8,6 +8,7 @@ import {
   IncomingWebhookDefaultArguments
 } from '@slack/webhook';
 import {Context} from '@actions/github/lib/context';
+import {thisExpression} from '@babel/types';
 
 interface Accessory {
   color: string;
@@ -90,12 +91,14 @@ class Block {
    */
   public async getCommitFields(token: string): Promise<MrkdwnElement[]> {
     const {owner, repo} = this.context.repo;
-    const {sha} = this.context;
+    const ref: string = this.isPullRequest
+      ? this.context.ref.replace(/refs\/heads\//, '')
+      : this.context.sha;
     const client: github.GitHub = new github.GitHub(token);
     const {
       data: commit
     }: Octokit.Response<Octokit.ReposGetCommitResponse> = await client.repos.getCommit(
-      {owner, repo, ref: sha}
+      {owner, repo, ref}
     );
     const authorName: string = commit.author.login;
     const authorUrl: string = commit.author.html_url;