From 1af1bc346059376605665f1fffdf4fd8fdbccfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <f@miniflux.net>
Date: Fri, 1 Dec 2023 17:24:24 -0800
Subject: [PATCH] Google Reader API: Allow rename and move feed at the same
 time

Fixes #2191
---
 internal/googlereader/handler.go | 11 ++++++-----
 1 file 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
 			}