add organization webhook support #14784

adelowo · 2021-02-24T07:54:40Z

a1012112796 commented

2021-02-24 07:54:40 +00:00

(Migrated from github.com)

it's same with gh, ref:
https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#organization
https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#team
https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#membership

it's same with gh, ref: https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#organization https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#team https://docs.github.com/en/github-ae@latest/developers/webhooks-and-events/webhook-events-and-payloads#membership

👍 3

adelowo reviewed 2021-06-23 22:28:06 +00:00

models/webhook.go

						
				@ -627,10 +663,38 @@ func (h HookEventType) Event() string {

						return "repository"

					case HookEventRelease:

adelowo commented

2021-06-23 22:26:46 +00:00

  HookEventLevelRepo HookEventLevel = iota + 1

iota along makes it zero and it feels kind of weird seeing a valid state as 0

```suggestion HookEventLevelRepo HookEventLevel = iota + 1 ``` iota along makes it zero and it feels kind of weird seeing a valid state as 0

models/webhook.go

						
				@ -761,1 +826,4 @@

				// FindOrgUndeliveredHookTasks  finds the undelivered hook tasks of an organisation

				func FindOrgUndeliveredHookTasks(orgID int64) ([]*HookTask, error) {

					tasks := make([]*HookTask, 0, 5)

adelowo commented

2021-06-23 22:27:25 +00:00

// FindOrgUndeliveredHookTasks finds the undelivered hook tasks of an organisation

```suggestion // FindOrgUndeliveredHookTasks finds the undelivered hook tasks of an organisation ```

zeripath reviewed 2021-06-24 19:52:08 +00:00

services/webhook/webhook.go

						
				@ -92,3 +92,3 @@

				}

				// PrepareWebhook adds special webhook to task queue for given payload.

				// PrepareWebhook adds special repository webhook to task queue for given payload.

zeripath commented

2021-06-24 19:52:08 +00:00

It probably would be simpler to have:

func PrepareWebhook(w *models.Webhook, repo *models.Repository, event models.HookEventType, p api.Payloader) error {
  return PrepareRepoOrgWebhook(w, repo, nil, event, p)
}

func PrepareOrgWebhook(w *models.Webhook, org *models.User, event models.HookEventType, p api.Payloader) error {
  return PrepareRepoOrgWebhook(w, nil, org, event, p)
}

func PrepareRepoOrgWebhook(w *models.Webhook, repo *models.Repository, org *models.User, event models.HookEventType, p api.Payloader) error {
 ...
}

Then you would need most of the changes in modules/notification/webhook/webhook.go and elsewhere.

It probably would be simpler to have: ```go func PrepareWebhook(w *models.Webhook, repo *models.Repository, event models.HookEventType, p api.Payloader) error { return PrepareRepoOrgWebhook(w, repo, nil, event, p) } func PrepareOrgWebhook(w *models.Webhook, org *models.User, event models.HookEventType, p api.Payloader) error { return PrepareRepoOrgWebhook(w, nil, org, event, p) } func PrepareRepoOrgWebhook(w *models.Webhook, repo *models.Repository, org *models.User, event models.HookEventType, p api.Payloader) error { ... } ``` Then you would need most of the changes in modules/notification/webhook/webhook.go and elsewhere.