diff --git a/internal/cliactions/server/server.go b/internal/cliactions/server/server.go index 2b6f767..a06a52b 100644 --- a/internal/cliactions/server/server.go +++ b/internal/cliactions/server/server.go @@ -27,7 +27,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/api/client/timeline" "github.com/superseriousbusiness/gotosocial/internal/api/s2s/user" "github.com/superseriousbusiness/gotosocial/internal/api/s2s/webfinger" - "github.com/superseriousbusiness/gotosocial/internal/web/base" "github.com/superseriousbusiness/gotosocial/internal/api/security" "github.com/superseriousbusiness/gotosocial/internal/blob" "github.com/superseriousbusiness/gotosocial/internal/cliactions" @@ -44,6 +43,7 @@ import ( timelineprocessing "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "github.com/superseriousbusiness/gotosocial/internal/web/base" ) var models []interface{} = []interface{}{ diff --git a/internal/web/base.go b/internal/web/base.go index 3f81d01..eda3e92 100644 --- a/internal/web/base.go +++ b/internal/web/base.go @@ -26,7 +26,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/router" ) -type Module sruct { +type Module struct { config *config.Config log *logrus.Logger } @@ -34,7 +34,7 @@ type Module sruct { func New(config *config.Config, log *logrus.Logger) { return &Module{ config: config, - log: log + log: log, } } @@ -43,12 +43,12 @@ func (m *Module) Route(s router.Router) error { l := m.log.WithField("func", "BaseGETHandler") // serve static files from /assets - assetPath := filepath.Join(cwd, m.config.TemplateConfig.AssetBaseDir); - s.Static("/assets", assetPath); + assetPath := filepath.Join(cwd, m.config.TemplateConfig.AssetBaseDir) + s.Static("/assets", assetPath) // serve front-page s.GET("/", func(c *gin.Context) { - l.Trace("serving index html"); + l.Trace("serving index html") // FIXME: actual variables c.HTML(http.StatusOK, "index.tmpl", gin.H{ "instancename": "GoToSocial Test Instance", @@ -56,7 +56,7 @@ func (m *Module) Route(s router.Router) error { "countStatuses": 42069, "version": "1.0.0", "adminUsername": "@admin", - }); + }) }) return nil -} \ No newline at end of file +}