diff options
Diffstat (limited to 'internal/api/user.go')
| -rw-r--r-- | internal/api/user.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/internal/api/user.go b/internal/api/user.go index 8c660a57..d507d550 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -7,6 +7,7 @@ import ( json_parser "encoding/json" "errors" "net/http" + "regexp" "miniflux.app/v2/internal/http/request" "miniflux.app/v2/internal/http/response/json" @@ -82,6 +83,14 @@ func (h *handler) updateUser(w http.ResponseWriter, r *http.Request) { } } + cleanEnd := regexp.MustCompile(`(?m)\r\n\s*$`) + if userModificationRequest.BlockFilterEntryRules != nil { + *userModificationRequest.BlockFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.BlockFilterEntryRules, "") + } + if userModificationRequest.KeepFilterEntryRules != nil { + *userModificationRequest.KeepFilterEntryRules = cleanEnd.ReplaceAllLiteralString(*userModificationRequest.KeepFilterEntryRules, "") + } + if validationErr := validator.ValidateUserModification(h.store, originalUser.ID, &userModificationRequest); validationErr != nil { json.BadRequest(w, r, validationErr.Error()) return |