diff options
| author |  Frédéric Guillot <f@miniflux.net>
| 2023-12-01 17:24:24 -0800 |
|---|---|---|
| committer | Frédéric Guillot <f@miniflux.net>
| 2023-12-01 17:50:01 -0800 |
| commit | 1af1bc346059376605665f1fffdf4fd8fdbccfc1 (patch) | |
| tree | cc866e0b0ac00032062587603e4ea329e916aa68 /internal/googlereader/handler.go | |
| parent | d0f99cee1af46be932b3b6b7e343a511eaa829a1 (diff) | |
| download | v2-1af1bc346059376605665f1fffdf4fd8fdbccfc1.tar.gz v2-1af1bc346059376605665f1fffdf4fd8fdbccfc1.tar.zst v2-1af1bc346059376605665f1fffdf4fd8fdbccfc1.zip | |
Google Reader API: Allow rename and move feed at the same time
Fixes #2191
Diffstat (limited to 'internal/googlereader/handler.go')
| -rw-r--r-- | internal/googlereader/handler.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go index b971b163..e8114e59 100644 --- a/internal/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -872,18 +872,19 @@ func (h *handler) editSubscriptionHandler(w http.ResponseWriter, r *http.Request } case "edit": if title != "" { - err := rename(streamIds[0], title, h.store, userID) - if err != nil { + if err := rename(streamIds[0], title, h.store, userID); err != nil { json.ServerError(w, r, err) return } - } else { + } + + if r.Form.Has(ParamTagsAdd) { if newLabel.Type != LabelStream { json.BadRequest(w, r, errors.New("destination must be a label")) return } - err := move(streamIds[0], newLabel, h.store, userID) - if err != nil { + + if err := move(streamIds[0], newLabel, h.store, userID); err != nil { json.ServerError(w, r, err) return } |