From a96702757e94fde7bd57162ace4d25f4e3120f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sat, 30 Sep 2023 14:55:33 -0700 Subject: [PATCH] Fix Apprise logic to handle feed service URLs --- internal/integration/apprise/apprise.go | 2 +- internal/integration/integration.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/integration/apprise/apprise.go b/internal/integration/apprise/apprise.go index a74c8f1f..5c9fa9d5 100644 --- 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 index 2c8eeed6..5caba729 100644 --- a/internal/integration/integration.go +++ b/internal/integration/integration.go @@ -370,16 +370,17 @@ 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 { @@ -387,6 +388,7 @@ 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), slog.Any("error", err), ) }