southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix Apprise logic to handle feed service URLs

Browse source
This commit is contained in:
Frédéric Guillot 2023-09-30 14:55:33 -07:00
parent f98fc1e03a
commit a96702757e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/integration/apprise/apprise.go
View file

@ -28,7 +28,7 @@ func NewClient(serviceURL, baseURL string) *Client {
func (c *Client) SendNotification(entry *model.Entry) error { func (c *Client) SendNotification(entry *model.Entry) error {
if c.baseURL == "" || c.servicesURL == "" { 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" message := "[" + entry.Title + "]" + "(" + entry.URL + ")" + "\n\n"

6
internal/integration/integration.go
View file

@ -370,16 +370,17 @@ func PushEntries(feed *model.Feed, entries model.Entries, userIntegrations *mode
slog.Int64("user_id", userIntegrations.UserID), slog.Int64("user_id", userIntegrations.UserID),
slog.Int64("entry_id", entry.ID), slog.Int64("entry_id", entry.ID),
slog.String("entry_url", entry.URL), slog.String("entry_url", entry.URL),
slog.String("apprise_url", userIntegrations.AppriseURL),
) )
appriseServiceURLs := userIntegrations.AppriseURL appriseServiceURLs := userIntegrations.AppriseServicesURL
if feed.AppriseServiceURLs != "" { if feed.AppriseServiceURLs != "" {
appriseServiceURLs = feed.AppriseServiceURLs appriseServiceURLs = feed.AppriseServiceURLs
} }
client := apprise.NewClient( client := apprise.NewClient(
userIntegrations.AppriseServicesURL,
appriseServiceURLs, appriseServiceURLs,
userIntegrations.AppriseURL,
) )
if err := client.SendNotification(entry); err != nil { 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("user_id", userIntegrations.UserID),
slog.Int64("entry_id", entry.ID), slog.Int64("entry_id", entry.ID),
slog.String("entry_url", entry.URL), slog.String("entry_url", entry.URL),
slog.String("apprise_url", userIntegrations.AppriseURL),
slog.Any("error", err), slog.Any("error", err),
) )
} }