Fix Apprise logic to handle feed service URLs

miniflux · Sep 30, 2023 · a967027 · a967027
1 parent f98fc1e
commit a967027
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/internal/integration/apprise/apprise.go b/internal/integration/apprise/apprise.go
@@ -28,7 +28,7 @@ func NewClient(serviceURL, baseURL string) *Client {
 
 func (c *Client) SendNotification(entry *model.Entry) error {
 	if c.baseURL == "" || c.servicesURL == "" {
-		return fmt.Errorf("apprise: missing base URL or service URL")
+		return fmt.Errorf("apprise: missing base URL or services URL")
 	}
 
 	message := "[" + entry.Title + "]" + "(" + entry.URL + ")" + "\n\n"

diff --git a/internal/integration/integration.go b/internal/integration/integration.go
@@ -370,23 +370,25 @@ func PushEntries(feed *model.Feed, entries model.Entries, userIntegrations *mode
 					slog.Int64("user_id", userIntegrations.UserID),
 					slog.Int64("entry_id", entry.ID),
 					slog.String("entry_url", entry.URL),
+					slog.String("apprise_url", userIntegrations.AppriseURL),
 				)
 
-				appriseServiceURLs := userIntegrations.AppriseURL
+				appriseServiceURLs := userIntegrations.AppriseServicesURL
 				if feed.AppriseServiceURLs != "" {
 					appriseServiceURLs = feed.AppriseServiceURLs
 				}
 
 				client := apprise.NewClient(
-					userIntegrations.AppriseServicesURL,
 					appriseServiceURLs,
+					userIntegrations.AppriseURL,
 				)
 
 				if err := client.SendNotification(entry); err != nil {
 					slog.Error("Unable to send entry to Apprise",
 						slog.Int64("user_id", userIntegrations.UserID),
 						slog.Int64("entry_id", entry.ID),
 						slog.String("entry_url", entry.URL),
+						slog.String("apprise_url", userIntegrations.AppriseURL),
 						slog.Any("error", err),
 					)
 				}