git apply https://patch-diff.githubusercontent.com/raw/go-gitea/gitea…

…/pull/29690.diff
zjjhot · Mar 9, 2024 · d0615dd · d0615dd
1 parent 4564fbd
commit d0615dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go
@@ -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,
 	}
 }

diff --git a/services/webhook/payloader.go b/services/webhook/payloader.go
@@ -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
 	}