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( "[%s] %s %s pull request #%d: %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),