From c4f3ebf833cf7f4fe93ebd91d20151ec91e6ae86 Mon Sep 17 00:00:00 2001
From: Adriano Caloiaro <me@adriano.fyi>
Date: Sun, 30 Jul 2023 18:11:43 -0600
Subject: [PATCH] Fix permalinks

---
 partials/garbage/list.html |  2 +-
 partials/garbage/show.tmpl |  2 +-
 server.go                  | 28 ++++++++++++++++++----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/partials/garbage/list.html b/partials/garbage/list.html
index b12a256..a367b74 100644
--- a/partials/garbage/list.html
+++ b/partials/garbage/list.html
@@ -1,6 +1,6 @@
 <div class="posts">
  {{range .Posts}}
-   {{ template "show.tmpl" (PostWrapper . $.UserID $.ApiBaseUrl) }}
+   {{ template "show.tmpl" (argsfn "Garbage" . "UserID" $.UserID "ApiBaseUrl" $.ApiBaseUrl "argsfn" argsfn) }}
  {{end}}
 </div>
 
diff --git a/partials/garbage/show.tmpl b/partials/garbage/show.tmpl
index e2ed448..30edb6c 100644
--- a/partials/garbage/show.tmpl
+++ b/partials/garbage/show.tmpl
@@ -3,7 +3,7 @@
   <h1 class="post-title">
   {{if .Url}}<a href={{ .Url }} target="_blank">{{.Title}} (link)</a>{{else}}{{.Title}}{{ end }}</h1>
   <div class="post-meta">
-    {{ template "uplevel_button.tmpl" (PostWrapper . $.UserID $.ApiBaseUrl) }}
+    {{ template "uplevel_button.tmpl" (argsfn "Garbage" . "UserID" $.UserID "ApiBaseUrl" $.ApiBaseUrl) }}
     <span>Submitter:&nbsp;{{ .Username }}</span>
     {{ if eq .OwnerID.String $.UserID }}
     <a href="{{ $.ApiBaseUrl }}/garbage/{{ .ID }}/edit"
diff --git a/server.go b/server.go
index 067d453..5a39725 100644
--- a/server.go
+++ b/server.go
@@ -660,15 +660,20 @@ func createAccountHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 }
 
-// showParams creates a map that includes all ther required parameters for "garbage/show.tmpl"
-// this is used in "garbage/list.html" to combine all the params for the show template inside
-// the loop over all posts
-func showParams(g Garbage, userID string, apiBaseURL string) map[string]any {
-	return map[string]any{
-		"Garbage":    g,
-		"UserID":     userID,
-		"ApiBaseUrl": apiBaseURL,
+// argsfn is a template function to pass arbitrary template variables into sub-templates
+func argsfn(kvs ...interface{}) (map[string]interface{}, error) {
+	if len(kvs)%2 != 0 {
+		return nil, errors.New("args requires even number of arguments")
 	}
+	m := make(map[string]interface{})
+	for i := 0; i < len(kvs); i += 2 {
+		s, ok := kvs[i].(string)
+		if !ok {
+			return nil, errors.New("even args to args must be strings")
+		}
+		m[s] = kvs[i+1]
+	}
+	return m, nil
 }
 
 // listGarbageHandler returns the latest garbage
@@ -691,7 +696,7 @@ func listGarbageHandler(w http.ResponseWriter, r *http.Request) {
 
 	tmpl := template.Must(
 		template.New("list.html").
-			Funcs(template.FuncMap{"PostWrapper": showParams}).
+			Funcs(template.FuncMap{"argsfn": argsfn}).
 			ParseFS(partialsFS, "partials/garbage/list.html", "partials/garbage/*.tmpl"))
 
 	err = tmpl.ExecuteTemplate(w, "list.html", map[string]any{
@@ -730,7 +735,10 @@ func showGarbageHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var buff = bytes.NewBufferString("")
-	tmpl := template.Must(template.ParseFS(partialsFS, "partials/garbage/show.tmpl"))
+	tmpl := template.Must(
+		template.New("list.html").
+			Funcs(template.FuncMap{"argsfn": argsfn}).
+			ParseFS(partialsFS, "partials/garbage/show.tmpl", "partials/garbage/*.tmpl"))
 	err = tmpl.ExecuteTemplate(buff, "show.tmpl", map[string]any{
 		"Garbage":    garbage,
 		"ApiBaseUrl": apiURL(),