From eee1f3190355224eef63a4dcdef8c36eb3ca3738 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Mon, 3 Sep 2018 14:26:40 -0700 Subject: Refactor HTTP context handling --- ui/category_create.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'ui/category_create.go') diff --git a/ui/category_create.go b/ui/category_create.go index 8f7019f..20d280a 100644 --- a/ui/category_create.go +++ b/ui/category_create.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,16 +15,14 @@ import ( // CreateCategory shows the form to create a new category. func (c *Controller) CreateCategory(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 } - 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("menu", "categories") view.Set("user", user) view.Set("countUnread", c.store.CountUnreadEntries(user.ID)) -- cgit v1.2.3