aboutsummaryrefslogtreecommitdiff
path: root/internal/validator/feed.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/validator/feed.go')
-rw-r--r--internal/validator/feed.go33
1 files changed, 17 insertions, 16 deletions
diff --git a/internal/validator/feed.go b/internal/validator/feed.go
index 3d3a1caf..25f7f1fc 100644
--- a/internal/validator/feed.go
+++ b/internal/validator/feed.go
@@ -4,82 +4,83 @@
package validator // import "miniflux.app/v2/internal/validator"
import (
+ "miniflux.app/v2/internal/locale"
"miniflux.app/v2/internal/model"
"miniflux.app/v2/internal/storage"
)
// ValidateFeedCreation validates feed creation.
-func ValidateFeedCreation(store *storage.Storage, userID int64, request *model.FeedCreationRequest) *ValidationError {
+func ValidateFeedCreation(store *storage.Storage, userID int64, request *model.FeedCreationRequest) *locale.LocalizedError {
if request.FeedURL == "" || request.CategoryID <= 0 {
- return NewValidationError("error.feed_mandatory_fields")
+ return locale.NewLocalizedError("error.feed_mandatory_fields")
}
if !IsValidURL(request.FeedURL) {
- return NewValidationError("error.invalid_feed_url")
+ return locale.NewLocalizedError("error.invalid_feed_url")
}
if store.FeedURLExists(userID, request.FeedURL) {
- return NewValidationError("error.feed_already_exists")
+ return locale.NewLocalizedError("error.feed_already_exists")
}
if !store.CategoryIDExists(userID, request.CategoryID) {
- return NewValidationError("error.feed_category_not_found")
+ return locale.NewLocalizedError("error.feed_category_not_found")
}
if !IsValidRegex(request.BlocklistRules) {
- return NewValidationError("error.feed_invalid_blocklist_rule")
+ return locale.NewLocalizedError("error.feed_invalid_blocklist_rule")
}
if !IsValidRegex(request.KeeplistRules) {
- return NewValidationError("error.feed_invalid_keeplist_rule")
+ return locale.NewLocalizedError("error.feed_invalid_keeplist_rule")
}
return nil
}
// ValidateFeedModification validates feed modification.
-func ValidateFeedModification(store *storage.Storage, userID int64, request *model.FeedModificationRequest) *ValidationError {
+func ValidateFeedModification(store *storage.Storage, userID int64, request *model.FeedModificationRequest) *locale.LocalizedError {
if request.FeedURL != nil {
if *request.FeedURL == "" {
- return NewValidationError("error.feed_url_not_empty")
+ return locale.NewLocalizedError("error.feed_url_not_empty")
}
if !IsValidURL(*request.FeedURL) {
- return NewValidationError("error.invalid_feed_url")
+ return locale.NewLocalizedError("error.invalid_feed_url")
}
}
if request.SiteURL != nil {
if *request.SiteURL == "" {
- return NewValidationError("error.site_url_not_empty")
+ return locale.NewLocalizedError("error.site_url_not_empty")
}
if !IsValidURL(*request.SiteURL) {
- return NewValidationError("error.invalid_site_url")
+ return locale.NewLocalizedError("error.invalid_site_url")
}
}
if request.Title != nil {
if *request.Title == "" {
- return NewValidationError("error.feed_title_not_empty")
+ return locale.NewLocalizedError("error.feed_title_not_empty")
}
}
if request.CategoryID != nil {
if !store.CategoryIDExists(userID, *request.CategoryID) {
- return NewValidationError("error.feed_category_not_found")
+ return locale.NewLocalizedError("error.feed_category_not_found")
}
}
if request.BlocklistRules != nil {
if !IsValidRegex(*request.BlocklistRules) {
- return NewValidationError("error.feed_invalid_blocklist_rule")
+ return locale.NewLocalizedError("error.feed_invalid_blocklist_rule")
}
}
if request.KeeplistRules != nil {
if !IsValidRegex(*request.KeeplistRules) {
- return NewValidationError("error.feed_invalid_keeplist_rule")
+ return locale.NewLocalizedError("error.feed_invalid_keeplist_rule")
}
}