diff options
| author |  privatmamtora <privat.mamtora@gmail.com>
| 2024-07-03 04:03:49 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-07-02 21:03:49 -0700 |
| commit | 1a81866bb93a96d91fa5d61cb91949b5f4bad840 (patch) | |
| tree | 14db5c7a1bafd67943c8452d5b80420345fc3140 /internal/api/user.go | |
| parent | c4278821cbaf392873380396d3590d936e0dbcf1 (diff) | |
| download | v2-1a81866bb93a96d91fa5d61cb91949b5f4bad840.tar.gz v2-1a81866bb93a96d91fa5d61cb91949b5f4bad840.tar.zst v2-1a81866bb93a96d91fa5d61cb91949b5f4bad840.zip | |
Add global block and keep filters
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 |