Refactor HTTP response builder

1 files changed, 4 insertions, 5 deletions

diff --git a/ui/opml_upload.go b/ui/opml_upload.go
index 603b660..538f822 100644
--- a/ui/opml_upload.go
+++ b/ui/opml_upload.go
@@ -2,13 +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/request"
-	"miniflux.app/http/response"
 	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/logger"
@@ -21,14 +20,14 @@ import (
 func (c *Controller) UploadOPML(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
 	}
 
 	file, fileHeader, err := r.FormFile("file")
 	if err != nil {
 		logger.Error("[Controller:UploadOPML] %v", err)
-		response.Redirect(w, r, route.Path(c.router, "import"))
+		html.Redirect(w, r, route.Path(c.router, "import"))
 		return
 	}
 	defer file.Close()
@@ -59,5 +58,5 @@ func (c *Controller) UploadOPML(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	response.Redirect(w, r, route.Path(c.router, "feeds"))
+	html.Redirect(w, r, route.Path(c.router, "feeds"))
 }