add support for pull request comment webhooks

models/review.go

@@ -10,7 +10,6 @@ import (
  "code.gitea.io/gitea/modules/log"
  "code.gitea.io/gitea/modules/util"
  api "code.gitea.io/sdk/gitea"
-
  "github.com/go-xorm/builder"
  "github.com/go-xorm/xorm"
 )
@@ -220,12 +219,15 @@ func createReview(e Engine, opts CreateReviewOptions) (*Review, error) {
 
  var reviewHookType HookEventType
 
- if opts.Type == ReviewTypeApprove {
+ switch opts.Type {
+ case ReviewTypeApprove:
  reviewHookType = HookEventPullRequestApproved
- } else if opts.Type == ReviewTypeReject {
+ case ReviewTypeComment:
+ reviewHookType = HookEventPullRequestComment
+ case ReviewTypeReject:
  reviewHookType = HookEventPullRequestRejected
- } else {
- // Webhook for a review comment does not exists
+ default:
+ // unsupported review webhook type here
  return review, nil
  }
 

models/webhook.go

@@ -19,7 +19,6 @@ import (
  "code.gitea.io/gitea/modules/sync"
  "code.gitea.io/gitea/modules/util"
  api "code.gitea.io/sdk/gitea"
-
  "github.com/Unknwon/com"
  gouuid "github.com/satori/go.uuid"
 )
@@ -436,6 +435,7 @@ const (
  HookEventRelease HookEventType = "release"
  HookEventPullRequestApproved HookEventType = "pull_request_approved"
  HookEventPullRequestRejected HookEventType = "pull_request_rejected"
+ HookEventPullRequestComment HookEventType = "pull_request_commented"
 )
 
 // HookRequest represents hook task request information.

models/webhook_dingtalk.go

@@ -11,7 +11,6 @@ import (
 
  "code.gitea.io/git"
  api "code.gitea.io/sdk/gitea"
-
  dingtalk "github.com/lunny/dingtalk_webhook"
 )
 
@@ -280,7 +279,7 @@ func getDingtalkPullRequestApprovalPayload(p *api.PullRequestPayload, event Hook
  return nil, err
  }
 
- title = fmt.Sprintf("[%s] Review on pull request %s : #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
+ title = fmt.Sprintf("[%s] Pull request review %s : #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
  text = p.PullRequest.Body
 
  }
@@ -396,7 +395,7 @@ func GetDingtalkPayload(p api.Payloader, event HookEventType, meta string) (*Din
  return getDingtalkPushPayload(p.(*api.PushPayload))
  case HookEventPullRequest:
  return getDingtalkPullRequestPayload(p.(*api.PullRequestPayload))
- case HookEventPullRequestApproved, HookEventPullRequestRejected:
+ case HookEventPullRequestApproved, HookEventPullRequestRejected, HookEventPullRequestComment:
  return getDingtalkPullRequestApprovalPayload(p.(*api.PullRequestPayload), event)
  case HookEventRepository:
  return getDingtalkRepositoryPayload(p.(*api.RepositoryPayload))

models/webhook_discord.go

@@ -410,7 +410,7 @@ func getDiscordPullRequestApprovalPayload(p *api.PullRequestPayload, meta *Disco
  return nil, err
  }
 
- title = fmt.Sprintf("[%s] Review on pull request %s: #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
+ title = fmt.Sprintf("[%s] Pull request review %s: #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
  text = p.PullRequest.Body
  color = warnColor
  }
@@ -526,7 +526,7 @@ 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:
+ case HookEventPullRequestRejected, HookEventPullRequestApproved, HookEventPullRequestComment:
  return getDiscordPullRequestApprovalPayload(p.(*api.PullRequestPayload), discord, event)
  case HookEventRepository:
  return getDiscordRepositoryPayload(p.(*api.RepositoryPayload), discord)
@@ -538,11 +538,17 @@ func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (*Disc
 }
 
 func parseHookPullRequestEventType(event HookEventType) (string, error) {
- if event == HookEventPullRequestApproved {
+
+ switch event {
+
+ case HookEventPullRequestApproved:
  return "approved", nil
- } else if event == HookEventPullRequestRejected {
+ case HookEventPullRequestRejected:
  return "rejected", nil
- }
+ case HookEventPullRequestComment:
+ return "comment", nil
 
- return "", errors.New("unknown event type")
+ default:
+ return "", errors.New("unknown event type")
+ }
 }

models/webhook_slack.go

@@ -11,9 +11,8 @@ import (
  "strings"
 
  "code.gitea.io/git"
- api "code.gitea.io/sdk/gitea"
-
  "code.gitea.io/gitea/modules/setting"
+ api "code.gitea.io/sdk/gitea"
 )
 
 // SlackMeta contains the slack metadata
@@ -340,7 +339,7 @@ func getSlackPullRequestApprovalPayload(p *api.PullRequestPayload, slack *SlackM
  return nil, err
  }
 
- text = fmt.Sprintf("[%s] Review on pull request %s : %s by %s", p.Repository.FullName, action, titleLink, senderLink)
+ text = fmt.Sprintf("[%s] Pull request review %s : %s by %s", p.Repository.FullName, action, titleLink, senderLink)
  }
 
  return &SlackPayload{
@@ -404,7 +403,7 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackP
  return getSlackPushPayload(p.(*api.PushPayload), slack)
  case HookEventPullRequest:
  return getSlackPullRequestPayload(p.(*api.PullRequestPayload), slack)
- case HookEventPullRequestRejected, HookEventPullRequestApproved:
+ case HookEventPullRequestRejected, HookEventPullRequestApproved, HookEventPullRequestComment:
  return getSlackPullRequestApprovalPayload(p.(*api.PullRequestPayload), slack, event)
  case HookEventRepository:
  return getSlackRepositoryPayload(p.(*api.RepositoryPayload), slack)