fix

mtojek · mtojek · commit d0d963d873c8 · 2024-10-02T15:19:27.000+02:00
diff --git a/coderd/notifications/dispatch/webhook.go b/coderd/notifications/dispatch/webhook.go
@@ -41,21 +41,21 @@ func NewWebhookHandler(cfg codersdk.NotificationsWebhookConfig, log slog.Logger)
 	return &WebhookHandler{cfg: cfg, log: log, cl: &http.Client{}}
 }
 
-func (w *WebhookHandler) Dispatcher(payload types.MessagePayload, title, body string) (DeliveryFunc, error) {
+func (w *WebhookHandler) Dispatcher(payload types.MessagePayload, titleMarkdown, bodyMarkdown string) (DeliveryFunc, error) {
 	if w.cfg.Endpoint.String() == "" {
 		return nil, xerrors.New("webhook endpoint not defined")
 	}
 
-	titlePlaintext, err := markdown.PlaintextFromMarkdown(title)
+	titlePlaintext, err := markdown.PlaintextFromMarkdown(titleMarkdown)
 	if err != nil {
 		return nil, xerrors.Errorf("render title: %w", err)
 	}
-	bodyPlaintext, err := markdown.PlaintextFromMarkdown(body)
+	bodyPlaintext, err := markdown.PlaintextFromMarkdown(bodyMarkdown)
 	if err != nil {
 		return nil, xerrors.Errorf("render body: %w", err)
 	}
 
-	return w.dispatch(payload, titlePlaintext, title, bodyPlaintext, body, w.cfg.Endpoint.String()), nil
+	return w.dispatch(payload, titlePlaintext, titleMarkdown, bodyPlaintext, bodyMarkdown, w.cfg.Endpoint.String()), nil
 }
 
 func (w *WebhookHandler) dispatch(msgPayload types.MessagePayload, titlePlaintext, titleMarkdown, bodyPlaintext, bodyMarkdown, endpoint string) DeliveryFunc {

Original file line number	Diff line number	Diff line change
`@@ -41,21 +41,21 @@ func NewWebhookHandler(cfg codersdk.NotificationsWebhookConfig, log slog.Logger)`
`41`	`41`	`return &WebhookHandler{cfg: cfg, log: log, cl: &http.Client{}}`
`42`	`42`	`}`
`43`	`43`
`44`		`-func (w *WebhookHandler) Dispatcher(payload types.MessagePayload, title, body string) (DeliveryFunc, error) {`
	`44`	`+func (w *WebhookHandler) Dispatcher(payload types.MessagePayload, titleMarkdown, bodyMarkdown string) (DeliveryFunc, error) {`
`45`	`45`	`if w.cfg.Endpoint.String() == "" {`
`46`	`46`	`return nil, xerrors.New("webhook endpoint not defined")`
`47`	`47`	`}`
`48`	`48`
`49`		`- titlePlaintext, err := markdown.PlaintextFromMarkdown(title)`
	`49`	`+ titlePlaintext, err := markdown.PlaintextFromMarkdown(titleMarkdown)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return nil, xerrors.Errorf("render title: %w", err)`
`52`	`52`	`}`
`53`		`- bodyPlaintext, err := markdown.PlaintextFromMarkdown(body)`
	`53`	`+ bodyPlaintext, err := markdown.PlaintextFromMarkdown(bodyMarkdown)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return nil, xerrors.Errorf("render body: %w", err)`
`56`	`56`	`}`
`57`	`57`
`58`		`- return w.dispatch(payload, titlePlaintext, title, bodyPlaintext, body, w.cfg.Endpoint.String()), nil`
	`58`	`+ return w.dispatch(payload, titlePlaintext, titleMarkdown, bodyPlaintext, bodyMarkdown, w.cfg.Endpoint.String()), nil`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func (w *WebhookHandler) dispatch(msgPayload types.MessagePayload, titlePlaintext, titleMarkdown, bodyPlaintext, bodyMarkdown, endpoint string) DeliveryFunc {`