From e2d862f2f67028ca3439d7ac303c18572fb34942 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 15 Mar 2024 18:17:13 -0700 Subject: Display an error message on edit feed page when the feed URL is not unique --- internal/validator/feed.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'internal/validator/feed.go') diff --git a/internal/validator/feed.go b/internal/validator/feed.go index 25f7f1fc..6a353892 100644 --- a/internal/validator/feed.go +++ b/internal/validator/feed.go @@ -39,7 +39,7 @@ func ValidateFeedCreation(store *storage.Storage, userID int64, request *model.F } // ValidateFeedModification validates feed modification. -func ValidateFeedModification(store *storage.Storage, userID int64, request *model.FeedModificationRequest) *locale.LocalizedError { +func ValidateFeedModification(store *storage.Storage, userID, feedID int64, request *model.FeedModificationRequest) *locale.LocalizedError { if request.FeedURL != nil { if *request.FeedURL == "" { return locale.NewLocalizedError("error.feed_url_not_empty") @@ -48,6 +48,10 @@ func ValidateFeedModification(store *storage.Storage, userID int64, request *mod if !IsValidURL(*request.FeedURL) { return locale.NewLocalizedError("error.invalid_feed_url") } + + if store.AnotherFeedURLExists(userID, feedID, *request.FeedURL) { + return locale.NewLocalizedError("error.feed_already_exists") + } } if request.SiteURL != nil { -- cgit v1.2.3