Simplify footer render

app/lib/htmltemplate/engine.go

@@ -50,10 +50,7 @@ func (te *Engine) partialTemplate(w http.ResponseWriter, r *http.Request, mainTe
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
-	t, err = te.sanitizedContent(t, "footer", footer)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
+	vars["footerHTML"] = te.RenderMarkdown(footer)
 
 	// Output the status code.
 	w.WriteHeader(statusCode)
@@ -87,13 +84,10 @@ func (te *Engine) Post(w http.ResponseWriter, r *http.Request, mainTemplate stri
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
-	t, err = te.sanitizedContent(t, "footer", footer)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
+	vars["footerHTML"] = te.RenderMarkdown(footer)
 
 	// Parse the content.
-	t, err = te.sanitizedContent(t, "content", post.Content)
+	t, err = te.sanitizedContent(t, post.Content)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}

app/lib/htmltemplate/sanitize.go

@@ -9,25 +9,25 @@ import (
 	blackfriday "github.com/russross/blackfriday/v2"
 )
 
-// SanitizedHTML returns a sanitized content html.
-func (te *Engine) SanitizedHTML(content string) []byte {
+// RenderMarkdown renders markdown to html
+func (te *Engine) RenderMarkdown(markdown string) template.HTML {
 	// Ensure unit line endings are used when pulling out of JSON.
-	markdownWithUnixLineEndings := strings.Replace(content, "\r\n", "\n", -1)
+	markdownWithUnixLineEndings := strings.ReplaceAll(markdown, "\r\n", "\n")
 	htmlCode := blackfriday.Run([]byte(markdownWithUnixLineEndings))
 
 	// Sanitize by removing HTML if true.
 	if !te.allowUnsafeHTML {
 		htmlCode = bluemonday.UGCPolicy().SanitizeBytes(htmlCode)
 	}
-	return htmlCode
+	return template.HTML(htmlCode)
 }
 
 // sanitizedContent returns a sanitized content block or an error is one occurs.
-func (te *Engine) sanitizedContent(t *template.Template, name, markdown string) (*template.Template, error) {
-	htmlCode := te.SanitizedHTML(markdown)
+func (te *Engine) sanitizedContent(t *template.Template, markdown string) (*template.Template, error) {
+	htmlCode := te.RenderMarkdown(markdown)
 
 	// Change delimiters temporarily so code samples can use Go blocks.
-	safeContent := fmt.Sprintf(`[{[{define "%s"}]}]%s[{[{end}]}]`, name, htmlCode)
+	safeContent := fmt.Sprintf(`[{[{define "content"}]}]%s[{[{end}]}]`, htmlCode)
 	t = t.Delims("[{[{", "}]}]")
 	var err error
 	t, err = t.Parse(safeContent)

app/route/xml.go

@@ -171,7 +171,7 @@ func (c *XMLUtil) rss(w http.ResponseWriter, r *http.Request) (status int, err e
 	}
 
 	for _, v := range posts {
-		html := c.Render.SanitizedHTML(v.Post.Content)
+		html := c.Render.RenderMarkdown(v.Post.Content)
 		m.Items = append(m.Items, Item{
 			Title:   v.Title,
 			Link:    site.SiteURL() + "/" + v.FullURL(),

html/base.tmpl

@@ -71,7 +71,7 @@
         {{end}}
     </main>
     <footer>
-        {{template "footer" .}}
+        {{.footerHTML}}
     </footer>
 
     {{if GoogleAnalyticsID}}

html/dashboard.tmpl

@@ -25,7 +25,7 @@
         </content>
     </main>
     <footer>
-        {{template "footer" .}}
+        {{.footerHTML}}
     </footer>
 
     {{if EnableStackEdit}}