internal/notification/ntfy.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -49,13 +50,15 @@ func (c *NtfyChannel) Kind() string { return "ntfy" }
 // with ntfy headers. Returns (statusCode, latency, err). 4xx/5xx
 // responses are returned as errors with the status code set.
 func (c *NtfyChannel) Send(ctx context.Context, p Payload) (int, time.Duration, error) {
-	url := c.cfg.ServerURL + "/" + c.cfg.Topic
+	server := strings.TrimRight(c.cfg.ServerURL, "/")
+	url := server + "/" + c.cfg.Topic
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBufferString(p.Message))
 	if err != nil {
 		return 0, 0, fmt.Errorf("ntfy: build request: %w", err)
 	}
 
+	req.Header.Set("Content-Type", "text/plain")
 	req.Header.Set("Title", fmt.Sprintf("[%s] %s %s", p.Severity, p.HostName, p.Kind))
 	req.Header.Set("Tags", p.Severity+","+p.Kind)
 	req.Header.Set("Priority", priorityForSeverity(p.Severity, c.defaultPriority))

internal/notification/ntfy_test.go

@@ -12,12 +12,13 @@ func TestNtfySendsHeadersAndBody(t *testing.T) {
 	t.Parallel()
 
 	var (
-		gotTitle string
+		gotTitle       string
-		gotPri   string
+		gotPri         string
-		gotTags  string
+		gotTags        string
-		gotClick string
+		gotClick       string
-		gotAuth  string
+		gotAuth        string
-		gotBody  string
+		gotContentType string
+		gotBody        string
 	)
 
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -26,6 +27,7 @@ func TestNtfySendsHeadersAndBody(t *testing.T) {
 		gotTags = r.Header.Get("Tags")
 		gotClick = r.Header.Get("Click")
 		gotAuth = r.Header.Get("Authorization")
+		gotContentType = r.Header.Get("Content-Type")
 		b, _ := io.ReadAll(r.Body)
 		gotBody = string(b)
 		w.WriteHeader(http.StatusOK)
@@ -73,6 +75,9 @@ func TestNtfySendsHeadersAndBody(t *testing.T) {
 	if want := "Bearer tk1"; gotAuth != want {
 		t.Errorf("Authorization: got %q want %q", gotAuth, want)
 	}
+	if gotContentType != "text/plain" {
+		t.Errorf("Content-Type: got %q want %q", gotContentType, "text/plain")
+	}
 	if gotBody != "errors found" {
 		t.Errorf("body: got %q want %q", gotBody, "errors found")
 	}