Use vanilla HTTP handlers (refactoring)

1 files changed, 21 insertions, 10 deletions

diff --git a/ui/about.go b/ui/about.go
index 4de46a8..7618e01 100644
--- a/ui/about.go
+++ b/ui/about.go
@@ -5,21 +5,32 @@
 package ui
 
 import (
-	"github.com/miniflux/miniflux/http/handler"
+	"net/http"
+
+	"github.com/miniflux/miniflux/http/context"
+	"github.com/miniflux/miniflux/http/response/html"
+	"github.com/miniflux/miniflux/ui/session"
+	"github.com/miniflux/miniflux/ui/view"
 	"github.com/miniflux/miniflux/version"
 )
 
-// AboutPage shows the about page.
-func (c *Controller) AboutPage(ctx *handler.Context, request *handler.Request, response *handler.Response) {
-	args, err := c.getCommonTemplateArgs(ctx)
+// About shows the about page.
+func (c *Controller) About(w http.ResponseWriter, r *http.Request) {
+	ctx := context.New(r)
+
+	user, err := c.store.UserByID(ctx.UserID())
 	if err != nil {
-		response.HTML().ServerError(err)
+		html.ServerError(w, err)
 		return
 	}
 
-	response.HTML().Render("about", ctx.UserLanguage(), args.Merge(tplParams{
-		"version":    version.Version,
-		"build_date": version.BuildDate,
-		"menu":       "settings",
-	}))
+	sess := session.New(c.store, ctx)
+	view := view.New(c.tpl, ctx, sess)
+	view.Set("version", version.Version)
+	view.Set("build_date", version.BuildDate)
+	view.Set("menu", "settings")
+	view.Set("user", user)
+	view.Set("countUnread", c.store.CountUnreadEntries(user.ID))
+
+	html.OK(w, view.Render("about"))
 }