From 0d420f70d89281320d95e92db01b240a40c6e2f7 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Sat, 21 Jan 2023 19:38:59 +0100 Subject: Fix StaticURL in gemini --- src/gmi/tpl.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/gmi/tpl.go') diff --git a/src/gmi/tpl.go b/src/gmi/tpl.go index 3022fe2..8220a49 100644 --- a/src/gmi/tpl.go +++ b/src/gmi/tpl.go @@ -33,8 +33,9 @@ type rendererGetPostSeriesNextPreviousRes struct { } type renderer struct { - url *url.URL - postStore post.Store + url *url.URL + postStore post.Store + httpPublicURL *url.URL } func (r renderer) GetPosts(page, count int) (rendererGetPostsRes, error) { @@ -98,7 +99,9 @@ func (r renderer) PostBody(p post.StoredPost) (string, error) { return filepath.Join("/posts", id) }, StaticURL: func(path string) string { - return filepath.Join("/static", path) + httpPublicURL := *r.httpPublicURL + httpPublicURL.Path = filepath.Join(httpPublicURL.Path, "/static", path) + return httpPublicURL.String() }, Image: func(args ...string) (string, error) { @@ -207,8 +210,9 @@ func (a *api) tplHandler() (gemini.Handler, error) { buf := new(bytes.Buffer) err := tpl.Execute(buf, renderer{ - url: r.URL, - postStore: a.params.PostStore, + url: r.URL, + postStore: a.params.PostStore, + httpPublicURL: a.params.HTTPPublicURL, }) if err != nil { -- cgit v1.2.3