mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-17 12:53:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

move template functions before template loading

Browse source
This commit is contained in:
f0x 2021-07-08 15:38:12 +02:00
commit ac1783a697
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/router/router.go
View file

@ -47,8 +47,6 @@ type Router interface {
AttachMiddleware(handler gin.HandlerFunc)
// Attach 404 NoRoute handler
AttachNoRouteHandler(handler gin.HandlerFunc)
// Set Template function map
SetTemplateFuncMap(functions template.FuncMap)
// Start the router
Start()
// Stop the router
@ -101,11 +99,6 @@ func (r *router) Stop(ctx context.Context) error {
return r.srv.Shutdown(ctx)
}
// Set Template function map
func (r *router) SetTemplateFuncMap(functions template.FuncMap) {
r.engine.SetFuncMap(functions)
}
// New returns a new Router with the specified configuration, using the given logrus logger.
//
// The given DB is only used in the New function for parsing config values, and is not otherwise
@ -134,6 +127,9 @@ func New(cfg *config.Config, db db.DB, logger *logrus.Logger) (Router, error) {
return nil, err
}
// set template functions
loadTemplateFunctions(engine);
// load templates onto the engine
if err := loadTemplates(cfg, engine); err != nil {
return nil, err