diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-10 13:13:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 13:13:16 +0800 |
| commit | 33fca2b537d36cf998dd27425b2bb8ed5b0965f3 (patch) | |
| tree | 817f392502e1c176a5cd7e80290520cb940a8416 /modules/convert | |
| parent | edbaa5d3f05b5ca397524587ba9db15edd61bc29 (diff) | |
| download | gitea-33fca2b537d36cf998dd27425b2bb8ed5b0965f3.tar.gz gitea-33fca2b537d36cf998dd27425b2bb8ed5b0965f3.zip | |
Move webhook into models/webhook/ (#17579)
Diffstat (limited to 'modules/convert')
| -rw-r--r-- | modules/convert/convert.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 9c5e2037c5..7d67e2b5b1 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -14,11 +14,12 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/login" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/services/webhook" + webhook_service "code.gitea.io/gitea/services/webhook" ) // ToEmail convert models.EmailAddress to api.Email @@ -226,13 +227,13 @@ func ToGPGKeyEmail(email *models.EmailAddress) *api.GPGKeyEmail { } // ToHook convert models.Webhook to api.Hook -func ToHook(repoLink string, w *models.Webhook) *api.Hook { +func ToHook(repoLink string, w *webhook.Webhook) *api.Hook { config := map[string]string{ "url": w.URL, "content_type": w.ContentType.Name(), } - if w.Type == models.SLACK { - s := webhook.GetSlackHook(w) + if w.Type == webhook.SLACK { + s := webhook_service.GetSlackHook(w) config["channel"] = s.Channel config["username"] = s.Username config["icon_url"] = s.IconURL |