add webhook formatting for discord

models/webhook_discord.go

@@ -400,6 +400,40 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta)
  }, nil
 }
 
+func getDiscordPullRequestApprovalPayload(p *api.PullRequestPayload, meta *DiscordMeta, event HookEventType) (*DiscordPayload, error) {
+ var text, title string
+ var color int
+ switch p.Action {
+ case api.HookIssueSynchronized:
+ action, err := parseActionText(event)
+ if err != nil {
+ return nil, err
+ }
+
+ title = fmt.Sprintf("[%s] Review on pull request %s: #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
+ text = p.PullRequest.Body
+ color = warnColor
+ }
+
+ return &DiscordPayload{
+ Username: meta.Username,
+ AvatarURL: meta.IconURL,
+ Embeds: []DiscordEmbed{
+ {
+ Title: title,
+ Description: text,
+ URL: p.PullRequest.HTMLURL,
+ Color: color,
+ Author: DiscordEmbedAuthor{
+ Name: p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
+ IconURL: p.Sender.AvatarURL,
+ },
+ },
+ },
+ }, nil
+}
+
 func getDiscordRepositoryPayload(p *api.RepositoryPayload, meta *DiscordMeta) (*DiscordPayload, error) {
  var title, url string
  var color int
@@ -492,6 +526,8 @@ func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (*Disc
  return getDiscordPushPayload(p.(*api.PushPayload), discord)
  case HookEventPullRequest:
  return getDiscordPullRequestPayload(p.(*api.PullRequestPayload), discord)
+ case HookEventPullRequestRejected, HookEventPullRequestApproved:
+ return getDiscordPullRequestApprovalPayload(p.(*api.PullRequestPayload), discord, event)
  case HookEventRepository:
  return getDiscordRepositoryPayload(p.(*api.RepositoryPayload), discord)
  case HookEventRelease:
@@ -500,3 +536,13 @@ func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (*Disc
 
  return s, nil
 }
+
+func parseActionText(event HookEventType) (string, error) {
+ if event == HookEventPullRequestApproved {
+ return "approved", nil
+ } else if event == HookEventPullRequestRejected {
+ return "rejected", nil
+ }
+
+ return "", errors.New("unknown event type")
+}

models/webhook_slack.go

@@ -335,13 +335,9 @@ func getSlackPullRequestApprovalPayload(p *api.PullRequestPayload, slack *SlackM
  var text, title, attachmentText string
  switch p.Action {
  case api.HookIssueSynchronized:
- var action string
- if event == HookEventPullRequestRejected {
- action = "rejected"
- } else if event == HookEventPullRequestApproved {
- action = "approved"
- } else {
- return nil, errors.New("unknown event type")
+ action, err := parseActionText(event)
+ if err != nil {
+ return nil, err
  }
 
  text = fmt.Sprintf("[%s] Review on pull request %s : %s by %s", p.Repository.FullName, action, titleLink, senderLink)