|
@@ -474,20 +474,27 @@ func PushEntries(feed *model.Feed, entries model.Entries, userIntegrations *mode
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if userIntegrations.WebhookEnabled {
|
|
if userIntegrations.WebhookEnabled {
|
|
|
|
|
+ var webhookURL string
|
|
|
|
|
+ if feed.WebhookURL != "" {
|
|
|
|
|
+ webhookURL = feed.WebhookURL
|
|
|
|
|
+ } else {
|
|
|
|
|
+ webhookURL = userIntegrations.WebhookURL
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
slog.Debug("Sending new entries to Webhook",
|
|
slog.Debug("Sending new entries to Webhook",
|
|
|
slog.Int64("user_id", userIntegrations.UserID),
|
|
slog.Int64("user_id", userIntegrations.UserID),
|
|
|
slog.Int("nb_entries", len(entries)),
|
|
slog.Int("nb_entries", len(entries)),
|
|
|
slog.Int64("feed_id", feed.ID),
|
|
slog.Int64("feed_id", feed.ID),
|
|
|
- slog.String("webhook_url", userIntegrations.WebhookURL),
|
|
|
|
|
|
|
+ slog.String("webhook_url", webhookURL),
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
- webhookClient := webhook.NewClient(userIntegrations.WebhookURL, userIntegrations.WebhookSecret)
|
|
|
|
|
|
|
+ webhookClient := webhook.NewClient(webhookURL, userIntegrations.WebhookSecret)
|
|
|
if err := webhookClient.SendNewEntriesWebhookEvent(feed, entries); err != nil {
|
|
if err := webhookClient.SendNewEntriesWebhookEvent(feed, entries); err != nil {
|
|
|
slog.Debug("Unable to send new entries to Webhook",
|
|
slog.Debug("Unable to send new entries to Webhook",
|
|
|
slog.Int64("user_id", userIntegrations.UserID),
|
|
slog.Int64("user_id", userIntegrations.UserID),
|
|
|
slog.Int("nb_entries", len(entries)),
|
|
slog.Int("nb_entries", len(entries)),
|
|
|
slog.Int64("feed_id", feed.ID),
|
|
slog.Int64("feed_id", feed.ID),
|
|
|
- slog.String("webhook_url", userIntegrations.WebhookURL),
|
|
|
|
|
|
|
+ slog.String("webhook_url", webhookURL),
|
|
|
slog.Any("error", err),
|
|
slog.Any("error", err),
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|