From f49b42f70f902d4da1e0fa4080e99164b331b716 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 29 Apr 2018 16:35:04 -0700 Subject: Use vanilla HTTP handlers (refactoring) --- api/subscription.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'api/subscription.go') diff --git a/api/subscription.go b/api/subscription.go index 8a8feff..c858f0e 100644 --- a/api/subscription.go +++ b/api/subscription.go @@ -7,29 +7,30 @@ package api import ( "errors" "fmt" + "net/http" - "github.com/miniflux/miniflux/http/handler" + "github.com/miniflux/miniflux/http/response/json" "github.com/miniflux/miniflux/reader/subscription" ) // GetSubscriptions is the API handler to find subscriptions. -func (c *Controller) GetSubscriptions(ctx *handler.Context, request *handler.Request, response *handler.Response) { - websiteURL, err := decodeURLPayload(request.Body()) +func (c *Controller) GetSubscriptions(w http.ResponseWriter, r *http.Request) { + websiteURL, err := decodeURLPayload(r.Body) if err != nil { - response.JSON().BadRequest(err) + json.BadRequest(w, err) return } subscriptions, err := subscription.FindSubscriptions(websiteURL) if err != nil { - response.JSON().ServerError(errors.New("Unable to discover subscriptions")) + json.ServerError(w, errors.New("Unable to discover subscriptions")) return } if subscriptions == nil { - response.JSON().NotFound(fmt.Errorf("No subscription found")) + json.NotFound(w, fmt.Errorf("No subscription found")) return } - response.JSON().Standard(subscriptions) + json.OK(w, subscriptions) } -- cgit v1.2.3