diff options
Diffstat (limited to 'ui/feed_list.go')
| -rw-r--r-- | ui/feed_list.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ui/feed_list.go b/ui/feed_list.go index 553ee55..9fe4aac 100644 --- a/ui/feed_list.go +++ b/ui/feed_list.go @@ -2,12 +2,12 @@ // 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/context" + "miniflux.app/http/request" "miniflux.app/http/response/html" "miniflux.app/ui/session" "miniflux.app/ui/view" @@ -15,9 +15,7 @@ import ( // ShowFeedsPage shows the page with all subscriptions. func (c *Controller) ShowFeedsPage(w http.ResponseWriter, r *http.Request) { - ctx := context.New(r) - - user, err := c.store.UserByID(ctx.UserID()) + user, err := c.store.UserByID(request.UserID(r)) if err != nil { html.ServerError(w, err) return @@ -29,8 +27,8 @@ func (c *Controller) ShowFeedsPage(w http.ResponseWriter, r *http.Request) { return } - sess := session.New(c.store, ctx) - view := view.New(c.tpl, ctx, sess) + sess := session.New(c.store, request.SessionID(r)) + view := view.New(c.tpl, r, sess) view.Set("feeds", feeds) view.Set("total", len(feeds)) view.Set("menu", "feeds") |