Refactor HTTP context handling

1 files changed, 4 insertions, 5 deletions

diff --git a/ui/subscription_add.go b/ui/subscription_add.go
index f78c7c6..1639d0d 100644
--- a/ui/subscription_add.go
+++ b/ui/subscription_add.go
@@ -7,19 +7,18 @@ package ui  // import "miniflux.app/ui"
 import (
 	"net/http"
 
-	"miniflux.app/http/context"
 	"miniflux.app/http/response/html"
+	"miniflux.app/http/request"
 	"miniflux.app/ui/session"
 	"miniflux.app/ui/view"
 )
 
 // AddSubscription shows the form to add a new feed.
 func (c *Controller) AddSubscription(w http.ResponseWriter, r *http.Request) {
-	ctx := context.New(r)
-	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)
 
-	user, err := c.store.UserByID(ctx.UserID())
+	user, err := c.store.UserByID(request.UserID(r))
 	if err != nil {
 		html.ServerError(w, err)
 		return