From 43d8951296ce2f232ca94f0577e2e726291bf783 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Sun, 26 May 2024 21:16:02 +0200
Subject: Replace URL building methods with the URLBuilder

---
 src/http/tpl.go | 64 +--------------------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

(limited to 'src/http/tpl.go')

diff --git a/src/http/tpl.go b/src/http/tpl.go
index 57d7cfd..47cea80 100644
--- a/src/http/tpl.go
+++ b/src/http/tpl.go
@@ -9,9 +9,7 @@ import (
 	"io"
 	"io/fs"
 	"net/http"
-	"net/url"
 	"path/filepath"
-	"strings"
 
 	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
 	"dev.mediocregopher.com/mediocre-blog.git/src/post"
@@ -32,64 +30,6 @@ func mustReadTplFile(fileName string) string {
 	return string(b)
 }
 
-func (a *api) blogURL(base *url.URL, path string, abs bool) string {
-	// filepath.Join strips trailing slash, but we want to keep it
-	trailingSlash := strings.HasSuffix(path, "/")
-
-	path = filepath.Join("/", base.Path, path)
-
-	if trailingSlash && path != "/" {
-		path += "/"
-	}
-
-	if !abs {
-		return path
-	}
-
-	u := *base
-	u.Path = path
-	return u.String()
-}
-
-func (a *api) postURL(id string, abs bool) string {
-	path := filepath.Join("posts", id)
-	return a.blogURL(a.params.PublicURL, path, abs)
-}
-
-func (a *api) editPostURL(id string, abs bool) string {
-	return a.postURL(id, abs) + "?method=edit"
-}
-
-func (a *api) managePostsURL(abs bool) string {
-	return a.blogURL(a.params.PublicURL, "posts?method=manage", abs)
-}
-
-func (a *api) manageAssetsURL(abs bool) string {
-	return a.blogURL(a.params.PublicURL, "assets?method=manage", abs)
-}
-
-func (a *api) assetURL(id string, abs bool) string {
-	path := filepath.Join("assets", id)
-	return a.blogURL(a.params.PublicURL, path, false)
-}
-
-func (a *api) draftPostURL(id string, abs bool) string {
-	path := filepath.Join("drafts", id)
-	return a.blogURL(a.params.PublicURL, path, abs)
-}
-
-func (a *api) editDraftPostURL(id string, abs bool) string {
-	return a.draftPostURL(id, abs) + "?method=edit"
-}
-
-func (a *api) manageDraftPostsURL(abs bool) string {
-	return a.blogURL(a.params.PublicURL, "drafts", abs) + "?method=manage"
-}
-
-func (a *api) draftsURL(abs bool) string {
-	return a.blogURL(a.params.PublicURL, "drafts", abs)
-}
-
 func mustParseTpl(tpl *template.Template, name string) *template.Template {
 	return template.Must(tpl.New(name).Parse(mustReadTplFile(name)))
 }
@@ -121,9 +61,7 @@ func (a *api) newTPLData(r *http.Request, payload interface{}) tplData {
 		Methods: render.NewMethods(
 			r.Context(),
 			r.URL,
-			a.params.PublicURL,
-			a.params.PublicURL, // httpURL
-			a.params.GeminiPublicURL,
+			a.urlBuilder,
 			a.params.GeminiGatewayURL,
 			a.params.PostStore,
 			a.params.PostAssetStore,
-- 
cgit v1.2.3