diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/action.go | 40 | ||||
| -rw-r--r-- | models/webhook.go | 2 |
2 files changed, 19 insertions, 23 deletions
diff --git a/models/action.go b/models/action.go index 037ccbd6..d3393728 100644 --- a/models/action.go +++ b/models/action.go @@ -417,32 +417,28 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string, continue } + var payload BasePayload switch w.HookTaskType { case SLACK: - { - s, err := GetSlackPayload(p, w.Meta) - if err != nil { - return errors.New("action.GetSlackPayload: " + err.Error()) - } - CreateHookTask(&HookTask{ - Type: w.HookTaskType, - Url: w.Url, - BasePayload: s, - ContentType: w.ContentType, - IsSsl: w.IsSsl, - }) + s, err := GetSlackPayload(p, w.Meta) + if err != nil { + return errors.New("action.GetSlackPayload: " + err.Error()) } + payload = s default: - { - p.Secret = w.Secret - CreateHookTask(&HookTask{ - Type: w.HookTaskType, - Url: w.Url, - BasePayload: p, - ContentType: w.ContentType, - IsSsl: w.IsSsl, - }) - } + payload = p + p.Secret = w.Secret + } + + if err = CreateHookTask(&HookTask{ + Type: w.HookTaskType, + Url: w.Url, + BasePayload: payload, + ContentType: w.ContentType, + EventType: HOOK_EVENT_PUSH, + IsSsl: w.IsSsl, + }); err != nil { + return fmt.Errorf("CreateHookTask: %v", err) } } diff --git a/models/webhook.go b/models/webhook.go index 96af0b69..bfa52b99 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -205,7 +205,7 @@ func IsValidHookTaskType(name string) bool { type HookEventType string const ( - PUSH HookEventType = "push" + HOOK_EVENT_PUSH HookEventType = "push" ) // FIXME: just use go-gogs-client structs maybe? |