Move metatag filtering to html

internal/html/render_html.go

@@ -6,6 +6,7 @@ import (
 	"html/template"
 	"os"
 	"runtime"
+	"strings"
 )
 
 type Params struct {
@@ -30,6 +31,8 @@ type Params struct {
 // RenderHTMLString Renders the HTML template in internal/html with the given parameters
 func RenderHTMLString(params Params) []byte {
 	params.IsDev = os.Getenv("APP_ENV") != "production"
+	params.OGMetaTags = getOGMetaTags(params.MetaTags)
+	params.MetaTags = getMetaTags(params.MetaTags)
 	t := template.Must(template.New("").Parse(BaseTemplate))
 	var output bytes.Buffer
 	err := t.Execute(&output, params)
@@ -39,6 +42,26 @@ func RenderHTMLString(params Params) []byte {
 	return output.Bytes()
 }
 
+func getMetaTags(metaTags map[string]string) map[string]string {
+	newMetaTags := make(map[string]string)
+	for key, value := range metaTags {
+		if !strings.HasPrefix(key, "og:") {
+			newMetaTags[key] = value
+		}
+	}
+	return newMetaTags
+}
+
+func getOGMetaTags(metaTags map[string]string) map[string]string {
+	newMetaTags := make(map[string]string)
+	for key, value := range metaTags {
+		if strings.HasPrefix(key, "og:") {
+			newMetaTags[key] = value
+		}
+	}
+	return newMetaTags
+}
+
 type ErrorParams struct {
 	Error   string
 	RouteID string

render.go

@@ -35,10 +35,11 @@ type renderTask struct {
 }
 
 func (engine *Engine) RenderRoute(renderConfig RenderConfig) []byte {
+	pc, _, _, _ := runtime.Caller(1)
 	task := renderTask{
 		engine:             engine,
 		logger:             zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger(),
-		routeID:            getRouteID(),
+		routeID:            fmt.Sprint(pc),
 		filePath:           filepath.ToSlash(utils.GetFullFilePath(engine.Config.FrontendDir + "/" + renderConfig.File)),
 		config:             renderConfig,
 		serverRenderResult: make(chan ServerRenderResult),
@@ -50,40 +51,14 @@ func (engine *Engine) RenderRoute(renderConfig RenderConfig) []byte {
 	}
 	return html.RenderHTMLString(html.Params{
 		Title:      renderConfig.Title,
-		MetaTags:   getMetaTags(renderConfig.MetaTags),
-		OGMetaTags: getOGMetaTags(renderConfig.MetaTags),
+		MetaTags:   renderConfig.MetaTags,
 		JS:         template.JS(clientRenderResult.js),
 		CSS:        template.CSS(serverRenderResult.css),
 		RouteID:    task.routeID,
 		ServerHTML: template.HTML(serverRenderResult.html),
 	})
 }
 
-func getRouteID() string {
-	pc, _, _, _ := runtime.Caller(2)
-	return fmt.Sprint(pc)
-}
-
-func getMetaTags(metaTags map[string]string) map[string]string {
-	newMetaTags := make(map[string]string)
-	for key, value := range metaTags {
-		if !strings.HasPrefix(key, "og:") {
-			newMetaTags[key] = value
-		}
-	}
-	return newMetaTags
-}
-
-func getOGMetaTags(metaTags map[string]string) map[string]string {
-	newMetaTags := make(map[string]string)
-	for key, value := range metaTags {
-		if strings.HasPrefix(key, "og:") {
-			newMetaTags[key] = value
-		}
-	}
-	return newMetaTags
-}
-
 func (rt *renderTask) Render() (ServerRenderResult, ClientRenderResult, error) {
 	props, err := propsToString(rt.config.Props)
 	if err != nil {