Skip to content

Fix broken webhooks #29690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunny merged 5 commits into from
Mar 10, 2024
Merged

Fix broken webhooks #29690

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a9bcdb
Fix wechatwork webhook
lunny Mar 9, 2024
6052ecf
Use post method as default
lunny Mar 9, 2024
31035c5
Revert unnecessary change
lunny Mar 9, 2024
174e94b
Merge branch 'main' into lunny/fix_wechat_webhook
lunny Mar 9, 2024
770a543
Merge branch 'main' into lunny/fix_wechat_webhook
GiteaBot Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions routers/web/repo/setting/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ func wechatworkHookParams(ctx *context.Context) webhookParams {
Type: webhook_module.WECHATWORK,
URL: form.PayloadURL,
ContentType: webhook.ContentTypeJSON,
HTTPMethod: http.MethodPost,
WebhookForm: form.WebhookForm,
}
}
Expand Down
7 changes: 6 additions & 1 deletion services/webhook/payloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ func newJSONRequest[T any](pc payloadConvertor[T], w *webhook_model.Webhook, t *
return nil, nil, err
}

req, err := http.NewRequest(w.HTTPMethod, w.URL, bytes.NewReader(body))
method := w.HTTPMethod
if method == "" {
method = http.MethodPost
}

req, err := http.NewRequest(method, w.URL, bytes.NewReader(body))
if err != nil {
return nil, nil, err
}
Expand Down