From e77ec0d58b3ca9f865cdfdd18bc72170834c3ac9 Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Sat, 17 Jan 2026 23:01:46 -0700 Subject: [PATCH] replaced SubRender mechanism with standard Jet include directives --- ui/amcontext.go | 50 ------------------------------------------- ui/views/frame.jet | 6 +++--- ui/views/posts.jet | 15 +++++++++---- ui/views/slippage.jet | 13 +++++++++-- ui/views/top.jet | 7 +++--- 5 files changed, 28 insertions(+), 63 deletions(-) diff --git a/ui/amcontext.go b/ui/amcontext.go index 5dfe10c..e83abef 100644 --- a/ui/amcontext.go +++ b/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. diff --git a/ui/views/frame.jet b/ui/views/frame.jet index d3d1fbe..7e69c32 100644 --- a/ui/views/frame.jet +++ b/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 }}
- {{ .SubRender(amsterdam_innerPage) | raw }} + {{ include amsterdam_innerPage }}
diff --git a/ui/views/posts.jet b/ui/views/posts.jet index 6ff0808..b834297 100644 --- a/ui/views/posts.jet +++ b/ui/views/posts.jet @@ -99,11 +99,18 @@
{{ if advancedControls }}
{{ 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 }}
{{ if canHide }} diff --git a/ui/views/slippage.jet b/ui/views/slippage.jet index a28510e..116aad0 100644 --- a/ui/views/slippage.jet +++ b/ui/views/slippage.jet @@ -19,11 +19,20 @@
- {{ 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 }}
diff --git a/ui/views/top.jet b/ui/views/top.jet index a2a4dce..17ae6ef 100644 --- a/ui/views/top.jet +++ b/ui/views/top.jet @@ -49,10 +49,9 @@
- {{ ctxt := . }} - {{ range sideboxes }} - {{ ctxt.SetScratch("__sidebox", .) }} - {{ ctxt.SubRender(.TemplateName) | raw }} + {{ range i, s := sideboxes }} + {{ .SetScratch("__sidebox", s) }} + {{ include s.TemplateName }} {{ end }} {{ if !.CurrentUser().IsAnon }}