From 6b3933282e3aa9803636b2ba580aced5c202eaa9 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Tue, 24 Jan 2023 12:40:32 +0100 Subject: Refactor URL construction a bit BlogHTTPURL and BlogGeminiURL are now used specifically to construct absolute URLs to their respective endpoints. --- src/http/posts.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/http/posts.go') diff --git a/src/http/posts.go b/src/http/posts.go index 8cb8472..2c6f896 100644 --- a/src/http/posts.go +++ b/src/http/posts.go @@ -66,14 +66,16 @@ type postTplPayload struct { Body template.HTML } -func (a *api) postToPostTplPayload(storedPost post.StoredPost) (postTplPayload, error) { - - preprocessFuncs := post.PreprocessFunctions{ +func (a *api) postPreprocessFuncs() post.PreprocessFunctions { + return post.PreprocessFunctions{ BlogURL: func(path string) string { - return a.blogURL(path, false) + return a.blogURL(a.params.PublicURL, path, false) }, BlogHTTPURL: func(path string) string { - return a.blogURL(path, false) + return a.blogURL(a.params.PublicURL, path, true) + }, + BlogGeminiURL: func(path string) string { + return a.blogURL(a.params.GeminiPublicURL, path, true) }, AssetURL: func(id string) string { return a.assetURL(id, false) @@ -83,10 +85,15 @@ func (a *api) postToPostTplPayload(storedPost post.StoredPost) (postTplPayload, }, StaticURL: func(path string) string { path = filepath.Join("static", path) - return a.blogURL(path, false) + return a.blogURL(a.params.PublicURL, path, false) }, Image: a.postPreprocessFuncImage, } +} + +func (a *api) postToPostTplPayload(storedPost post.StoredPost) (postTplPayload, error) { + + preprocessFuncs := a.postPreprocessFuncs() bodyBuf := new(bytes.Buffer) -- cgit v1.2.3