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_unread.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'ui/entry_unread.go') diff --git a/ui/entry_unread.go b/ui/entry_unread.go index 4ef5731..37e9592 100644 --- a/ui/entry_unread.go +++ b/ui/entry_unread.go @@ -2,7 +2,7 @@ // 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" @@ -10,7 +10,6 @@ import ( "miniflux.app/http/request" "miniflux.app/http/response/html" "miniflux.app/http/route" - "miniflux.app/logger" "miniflux.app/model" "miniflux.app/storage" "miniflux.app/ui/session" @@ -21,7 +20,7 @@ import ( func (c *Controller) ShowUnreadEntry(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 } @@ -32,12 +31,12 @@ func (c *Controller) ShowUnreadEntry(w http.ResponseWriter, r *http.Request) { entry, err := builder.GetEntry() if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } if entry == nil { - html.NotFound(w) + html.NotFound(w, r) return } @@ -45,8 +44,7 @@ func (c *Controller) ShowUnreadEntry(w http.ResponseWriter, r *http.Request) { if entry.Status == model.EntryStatusRead { err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusUnread) if err != nil { - logger.Error("[Controller:ShowUnreadEntry] %v", err) - html.ServerError(w, nil) + html.ServerError(w, r, err) return } } @@ -55,7 +53,7 @@ func (c *Controller) ShowUnreadEntry(w http.ResponseWriter, r *http.Request) { entryPaginationBuilder.WithStatus(model.EntryStatusUnread) prevEntry, nextEntry, err := entryPaginationBuilder.Entries() if err != nil { - html.ServerError(w, err) + html.ServerError(w, r, err) return } @@ -72,8 +70,7 @@ func (c *Controller) ShowUnreadEntry(w http.ResponseWriter, r *http.Request) { // Always mark the entry as read after fetching the pagination. err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { - logger.Error("[Controller:ShowUnreadEntry] %v", err) - html.ServerError(w, nil) + html.ServerError(w, r, err) return } entry.Status = model.EntryStatusRead -- cgit v1.2.3