oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-31 18:31:01 +00:00
Code Wiki Activity

Refactor HTTP response builder

Browse source
This commit is contained in:
Frédéric Guillot 2018-10-07 18:42:43 -07:00
parent ddfe969d6c
commit 1f58b37a5e
94 changed files with 1701 additions and 644 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ui/entry_feed.go
View file

@ -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) ShowFeedEntry(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
}
@ -35,20 +34,19 @@ func (c *Controller) ShowFeedEntry(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
}
if entry.Status == model.EntryStatusUnread {
err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead)
if err != nil {
logger.Error("[Controller:ShowFeedEntry] %v", err)
html.ServerError(w, nil)
html.ServerError(w, r, err)
return
}
@ -59,7 +57,7 @@ func (c *Controller) ShowFeedEntry(w http.ResponseWriter, r *http.Request) {
entryPaginationBuilder.WithFeedID(feedID)
prevEntry, nextEntry, err := entryPaginationBuilder.Entries()
if err != nil {
html.ServerError(w, err)
html.ServerError(w, r, err)
return
}