From 9d1b1e19d4faeace187669ce618f243e386918da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sun, 25 Feb 2024 20:56:08 -0800 Subject: [PATCH] Google Reader: Do not return a 500 error when no items is returned --- internal/googlereader/handler.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/googlereader/handler.go b/internal/googlereader/handler.go index e8114e59..df3205c0 100644 --- a/internal/googlereader/handler.go +++ b/internal/googlereader/handler.go @@ -909,7 +909,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque ) if err := checkOutputFormat(w, r); err != nil { - json.ServerError(w, r, err) + json.BadRequest(w, r, err) return } @@ -960,7 +960,7 @@ func (h *handler) streamItemContentsHandler(w http.ResponseWriter, r *http.Reque } if len(entries) == 0 { - json.ServerError(w, r, fmt.Errorf("googlereader: no items returned from the database")) + json.BadRequest(w, r, fmt.Errorf("googlereader: no items returned from the database for item IDs: %v", itemIDs)) return } @@ -1206,7 +1206,7 @@ func (h *handler) subscriptionListHandler(w http.ResponseWriter, r *http.Request ) if err := checkOutputFormat(w, r); err != nil { - json.ServerError(w, r, err) + json.BadRequest(w, r, err) return } @@ -1252,7 +1252,7 @@ func (h *handler) userInfoHandler(w http.ResponseWriter, r *http.Request) { ) if err := checkOutputFormat(w, r); err != nil { - json.ServerError(w, r, err) + json.BadRequest(w, r, err) return } @@ -1277,7 +1277,7 @@ func (h *handler) streamItemIDsHandler(w http.ResponseWriter, r *http.Request) { ) if err := checkOutputFormat(w, r); err != nil { - json.ServerError(w, r, fmt.Errorf("googlereader: output only as json supported")) + json.BadRequest(w, r, err) return }