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/entry_scraper.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ui/entry_scraper.go') diff --git a/ui/entry_scraper.go b/ui/entry_scraper.go index 4c2d58c..c35d949 100644 --- a/ui/entry_scraper.go +++ b/ui/entry_scraper.go @@ -2,10 +2,9 @@ // 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 ( - "errors" "net/http" "miniflux.app/http/request" @@ -24,18 +23,18 @@ func (c *Controller) FetchContent(w http.ResponseWriter, r *http.Request) { entry, err := builder.GetEntry() if err != nil { - json.ServerError(w, err) + json.ServerError(w, r, err) return } if entry == nil { - json.NotFound(w, errors.New("Entry not found")) + json.NotFound(w, r) return } content, err := scraper.Fetch(entry.URL, entry.Feed.ScraperRules, entry.Feed.UserAgent) if err != nil { - json.ServerError(w, err) + json.ServerError(w, r, err) return } -- cgit v1.2.3