replaced SubRender mechanism with standard Jet include directives

ui/amcontext.go

@@ -11,10 +11,8 @@
 package ui
 
 import (
-	"bytes"
 	"context"
 	"fmt"
-	"maps"
 	"mime/multipart"
 	"net/http"
 	"strconv"
@@ -62,8 +60,6 @@ type AmContext interface {
 	RemoteIP() string
 	ReplaceUser(*database.User)
 	SaveSession() error
-	SubRender(string) ([]byte, error)
-	SubRender2(string, map[string]any) ([]byte, error)
 	SetCommunityContext(string) error
 	SetLeftMenu(string)
 	SetLoginCookie(string)
@@ -321,52 +317,6 @@ func (c *amContext) SaveSession() error {
 	return c.session.Save(c.echoContext.Request(), c.echoContext.Response())
 }
 
-/* SubRender renders a subtemplate to the output.
- * Parameters:
- *	   name = The name of the template to be rendered.
- * Returns:
- *     Byte array with the rendered data to be output.
- *     Standard Go error status.
- */
-func (c *amContext) SubRender(name string) ([]byte, error) {
-	view, err := views.GetTemplate(name)
-	if err != nil {
-		log.Errorf("unable to load template \"%s\": %v", name, err)
-		return nil, err
-	}
-	buf := new(bytes.Buffer)
-	if err = view.Execute(buf, c.VarMap(), c); err != nil {
-		log.Errorf("template \"%s\" failed subrender exec: %v", name, err)
-	}
-	return buf.Bytes(), err
-}
-
-/* SubRender2 renders a subtemplate to the output, with extra variables to be set.
- * Parameters:
- *	   name = The name of the template to be rendered.
- *     vals = Additional variable values to be set.
- * Returns:
- *     Byte array with the rendered data to be output.
- *     Standard Go error status.
- */
-func (c *amContext) SubRender2(name string, vals map[string]any) ([]byte, error) {
-	view, err := views.GetTemplate(name)
-	if err != nil {
-		log.Errorf("unable to load template \"%s\": %v", name, err)
-		return nil, err
-	}
-	newmap := make(jet.VarMap)
-	maps.Copy(newmap, c.VarMap())
-	for k, v := range vals {
-		newmap.Set(k, v)
-	}
-	buf := new(bytes.Buffer)
-	if err = view.Execute(buf, newmap, c); err != nil {
-		log.Errorf("template \"%s\" failed subrender exec: %v", name, err)
-	}
-	return buf.Bytes(), err
-}
-
 /* SetCommunityContext establishes the community context from a (ID or alias) parameter.
  * Parameters:
  *     param - String parameter selecting the community.

ui/views/frame.jet

@@ -90,16 +90,16 @@
                 {{ end }}
                 {{ .SetScratch("__menu", m) }}
                 {{ if m.Tag == "community" }}
-                    {{ .SubRender("menu_left_comm.jet") | raw }}
+                    {{ include "menu_left_comm.jet" }}
                 {{ else }}
-                    {{ .SubRender("menu_left.jet") | raw }}
+                    {{ include "menu_left.jet" }}
                 {{ end }}
             {{ end }}
         </div>
 
         <!-- MAIN CONTENT -->
         <div class="flex-1 bg-white">
-            {{ .SubRender(amsterdam_innerPage) | raw }}
+            {{ include amsterdam_innerPage }}
         </div>
     </div>
 

ui/views/posts.jet

@@ -99,11 +99,18 @@
         <!-- Messages -->
         <div class="space-y-6 mb-8">
             {{ if advancedControls }}<div class="flex gap-4">{{ end }}
-                {{ m := map("foo", "bar") }}
+                {{ post_cur := nil }}
+                {{ post_userName := "" }}
+                {{ post_text := "" }}
+                {{ post_overrideLine := "" }}
+                {{ post_overrideLink := "" }}
                 {{ range i, p := posts }}
-                    {{ m = map("post_cur", p, "post_userName", post_getUserName(p, .), "post_text", post_getText(p, .),
-                            "post_overrideLine", post_getOverrideLine(p, .), "post_overrideLink", post_getOverrideLink(p, post_topicPermalink)) }}
-                    {{ .SubRender2("singlepost.jet", m) | raw }}
+                    {{ post_cur = p }}
+                    {{ post_userName = post_getUserName(p, .) }}
+                    {{ post_text = post_getText(p, .) }}
+                    {{ post_overrideLine = post_getOverrideLine(p, .) }}
+                    {{ post_overrideLink = post_getOverrideLink(p, post_topicPermalink) }}
+                    {{ include "singlepost.jet" }}
                     {{ if advancedControls }}
                         <div class="flex flex-col gap-2">
                             {{ if canHide }}

ui/views/slippage.jet

@@ -19,11 +19,20 @@
 
         <!-- Messages -->
         <div class="space-y-6 mb-8">
-            {{ m := map("foo", "bar") }}
+            {{ post_cur := nil }}
+            {{ post_userName := "" }}
+            {{ post_text := "" }}
+            {{ post_overrideLine := "" }}
+            {{ post_overrideLink := "" }}
             {{ range i, p := posts }}
                 {{ m = map("post_cur", p, "post_userName", post_getUserName(p, .), "post_text", post_getText(p, .),
                            "post_overrideLine", post_getOverrideLine(p, .), "post_overrideLink", post_getOverrideLink(p, post_topicPermalink)) }}
-                {{ .SubRender2("singlepost.jet", m) | raw }}
+                {{ post_cur = p }}
+                {{ post_userName = post_getUserName(p, .) }}
+                {{ post_text = post_getText(p, .) }}
+                {{ post_overrideLine = post_getOverrideLine(p, .) }}
+                {{ post_overrideLink = post_getOverrideLink(p, post_topicPermalink) }}
+                {{ include "singlepost.jet" }}
             {{ end }}
         </div>
 

ui/views/top.jet

@@ -49,10 +49,9 @@
 
     <!-- RIGHT SIDEBAR -->
     <div class="w-80 p-4">
-        {{ ctxt := . }}
-        {{ range sideboxes }}
-            {{ ctxt.SetScratch("__sidebox", .) }}
-            {{ ctxt.SubRender(.TemplateName) | raw }}
+        {{ range i, s := sideboxes }}
+            {{ .SetScratch("__sidebox", s) }}
+            {{ include s.TemplateName }}
         {{ end }}
 
         {{ if !.CurrentUser().IsAnon }}