From 1f58b37a5e86603b16e137031c36f37580e9d410 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 7 Oct 2018 18:42:43 -0700 Subject: Refactor HTTP response builder --- ui/feed_update.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'ui/feed_update.go') diff --git a/ui/feed_update.go b/ui/feed_update.go index 6cc4776..66b6d40 100644 --- a/ui/feed_update.go +++ b/ui/feed_update.go @@ -2,14 +2,13 @@ // Use of this source code is governed by the Apache 2.0 // license that can be found in the LICENSE file. -package ui // import "miniflux.app/ui" +package ui // import "miniflux.app/ui" import ( "net/http" "miniflux.app/http/client" "miniflux.app/http/request" - "miniflux.app/http/response" "miniflux.app/http/response/html" "miniflux.app/http/route" "miniflux.app/logger" @@ -22,25 +21,25 @@ import ( func (c *Controller) UpdateFeed(w http.ResponseWriter, r *http.Request) { user, err := c.store.UserByID(request.UserID(r)) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } feedID := request.RouteInt64Param(r, "feedID") feed, err := c.store.FeedByID(user.ID, feedID) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } if feed == nil { - html.NotFound(w) + html.NotFound(w, r) return } categories, err := c.store.Categories(user.ID) if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } @@ -71,5 +70,5 @@ func (c *Controller) UpdateFeed(w http.ResponseWriter, r *http.Request) { return } - response.Redirect(w, r, route.Path(c.router, "feedEntries", "feedID", feed.ID)) + html.Redirect(w, r, route.Path(c.router, "feedEntries", "feedID", feed.ID)) } -- cgit v1.2.3