diff options
author | Brian Picciano <mediocregopher@gmail.com> | 2024-05-26 21:16:02 +0200 |
---|---|---|
committer | Brian Picciano <mediocregopher@gmail.com> | 2024-05-26 21:16:02 +0200 |
commit | 43d8951296ce2f232ca94f0577e2e726291bf783 (patch) | |
tree | a04793b1e15e10040201dfafd1c25c649030f72c /src/http/tpl.go | |
parent | a6342a3748beaee1ec3c2dc662af6deec0c3959d (diff) |
Replace URL building methods with the URLBuilder
Diffstat (limited to 'src/http/tpl.go')
-rw-r--r-- | src/http/tpl.go | 64 |
1 files changed, 1 insertions, 63 deletions
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, |