dkforest

commit d8c3cd5800dad698bf29eae9d945f377c6a92f66
parent b213930ae3f0974d932df625da138e2afbbefc90
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 22 Jun 2023 00:35:26 -0700

cleanup

Diffstat:
M
pkg/web/web.go
 | 
23
+++++++++++------------

1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/pkg/web/web.go b/pkg/web/web.go
@@ -32,10 +32,7 @@ import (
 )
 
 func getMainServer(db *database.DkfDB, i18nBundle *i18n.Bundle, renderer *tmp.Templates) echo.HandlerFunc {
-	e := echo.New()
-	e.HideBanner = true
-	e.HidePort = true
-	e.Debug = true
+	e := newEcho()
 
 	e.Server.ReadHeaderTimeout = 10 * time.Second
 	e.Server.ReadTimeout = 10 * time.Second
@@ -321,12 +318,9 @@ func getMainServer(db *database.DkfDB, i18nBundle *i18n.Bundle, renderer *tmp.Te
 }
 
 func getBaseServer(db *database.DkfDB) *echo.Echo {
-	e := echo.New()
+	e := newEcho()
 	renderer := tmp.GetRenderer(e)
 	i18nBundle := getI18nBundle()
-	e.HideBanner = true
-	e.HidePort = true
-	e.Debug = true
 	e.Renderer = renderer
 	e.Use(middlewares.SetUselessHeadersMiddleware)
 	e.GET("/file-drop/:uuid", handlers.FileDropHandler, middlewares.SetDatabaseMiddleware(db), middlewares.I18nMiddleware(i18nBundle, "en"))
@@ -349,10 +343,7 @@ func getI2pServer(db *database.DkfDB) *echo.Echo {
 func getTorServer(db *database.DkfDB) *echo.Echo {
 	rp := getReverseProxy(config.GogsURL)
 	be := getBaseServer(db)
-	e := echo.New()
-	e.HideBanner = true
-	e.HidePort = true
-	e.Debug = true
+	e := newEcho()
 	e.Any("*", func(c echo.Context) error {
 		res := c.Response()
 		req := c.Request()
@@ -462,6 +453,14 @@ func getReverseProxy(u string) http.Handler {
 	return reverseProxy
 }
 
+func newEcho() *echo.Echo {
+	e := echo.New()
+	e.HideBanner = true
+	e.HidePort = true
+	e.Debug = true
+	return e
+}
+
 func configTorProdServer(e *echo.Echo) {
 	if config.Development.IsTrue() {
 		return