#6: Fix Gotify URL handling

saaste · Apr 14, 2024 · 4550b52 · 4550b52
1 parent ce7eb9d
commit 4550b52
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/config/config.go b/config/config.go
@@ -46,9 +46,16 @@ func LoadConfig() (*AppConfig, error) {
 
 	appConfig.AppVersion = appVersion
 
-	// Validate base URL
+	if appConfig.GotifyEnabled && (appConfig.GotifyToken == "" || appConfig.GotifyURL == "") {
+		return nil, fmt.Errorf("gotify notifications are enabled but token or gotify URL is empty")
+	}
+
+	// Validate trailing slash of URLS
 	if !strings.HasSuffix(appConfig.BaseURL, "/") {
-		return nil, fmt.Errorf("base URL must have a trailing slash")
+		appConfig.BaseURL = fmt.Sprintf("%s/", appConfig.BaseURL)
+	}
+	if appConfig.GotifyURL != "" && !strings.HasSuffix(appConfig.GotifyURL, "/") {
+		appConfig.GotifyURL = fmt.Sprintf("%s/", appConfig.GotifyURL)
 	}
 
 	return appConfig, nil

diff --git a/notifications/gotify.go b/notifications/gotify.go
@@ -52,7 +52,7 @@ func (n *Notifier) SendGotifyMessage(title string, message string) error {
 		return fmt.Errorf("marshaling request body failed: %w", err)
 	}
 
-	gotifyUrl := fmt.Sprintf("%s/message", n.appConfig.GotifyURL)
+	gotifyUrl := fmt.Sprintf("%smessage", n.appConfig.GotifyURL)
 	req, err := http.NewRequest(http.MethodPost, gotifyUrl, bytes.NewBuffer(data))
 	if err != nil {
 		return fmt.Errorf("creating a request failed: %w", err)