From f71f1a078d469333a4e10a934947eaf0e22e0d2e Mon Sep 17 00:00:00 2001
From: iinuwa <isaiah.inuwa@gmail.com>
Date: Fri, 2 Oct 2020 06:11:52 -0500
Subject: [PATCH] Make a distinction between closed and merged GitHub PRs
 (#337)

* Make a distinction between closed and merged GitHub PRs

Signed-off-by: Isaiah Inuwa <isaiah.inuwa@gmail.com>

* Use assignment shorthand

Co-authored-by: Kegsay <kegsay@gmail.com>

Co-authored-by: Kegsay <kegsay@gmail.com>
---
 services/github/webhook/webhook.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/github/webhook/webhook.go b/services/github/webhook/webhook.go
index d639ab7..dd8ccea 100644
--- a/services/github/webhook/webhook.go
+++ b/services/github/webhook/webhook.go
@@ -155,11 +155,17 @@ func pullRequestHTMLMessage(p github.PullRequestEvent) string {
 	if p.PullRequest.Assignee != nil && p.PullRequest.Assignee.Login != nil {
 		actionTarget = fmt.Sprintf(" to %s", *p.PullRequest.Assignee.Login)
 	}
+
+	prAction := *p.Action
+	if prAction == "closed" && *p.PullRequest.Merged {
+		prAction = "merged"
+	}
+
 	return fmt.Sprintf(
 		"[<u>%s</u>] %s %s <b>pull request #%d</b>: %s [%s]%s - %s",
 		html.EscapeString(*p.Repo.FullName),
 		html.EscapeString(*p.Sender.Login),
-		html.EscapeString(*p.Action),
+		html.EscapeString(prAction),
 		*p.Number,
 		html.EscapeString(*p.PullRequest.Title),
 		html.EscapeString(*p.PullRequest.State),