Allow url construction to work if blog is under a sub-path
This commit is contained in:
parent
f536b16e17
commit
1cfdac5e8c
@ -37,6 +37,7 @@ type rendererGetPostSeriesNextPreviousRes struct {
|
||||
type renderer struct {
|
||||
url *url.URL
|
||||
postStore post.Store
|
||||
gmiPublicURL *url.URL
|
||||
httpPublicURL *url.URL
|
||||
}
|
||||
|
||||
@ -92,7 +93,7 @@ func (r renderer) PostBody(p post.StoredPost) (string, error) {
|
||||
|
||||
preprocessFuncs := post.PreprocessFunctions{
|
||||
BlogURL: func(path string) string {
|
||||
return filepath.Join("/", path)
|
||||
return filepath.Join("/", r.gmiPublicURL.Path, path)
|
||||
},
|
||||
AssetURL: func(id string) string {
|
||||
return filepath.Join("/assets", id)
|
||||
@ -220,6 +221,7 @@ func (a *api) tplHandler() (gemini.Handler, error) {
|
||||
err := tpl.Execute(buf, renderer{
|
||||
url: r.URL,
|
||||
postStore: a.params.PostStore,
|
||||
gmiPublicURL: a.params.PublicURL,
|
||||
httpPublicURL: a.params.HTTPPublicURL,
|
||||
})
|
||||
|
||||
|
@ -31,14 +31,16 @@ func (a *api) blogURL(path string, abs bool) string {
|
||||
// filepath.Join strips trailing slash, but we want to keep it
|
||||
trailingSlash := strings.HasSuffix(path, "/")
|
||||
|
||||
res := filepath.Join("/", path)
|
||||
res := filepath.Join("/", a.params.PublicURL.Path, path)
|
||||
|
||||
if trailingSlash && res != "/" {
|
||||
res += "/"
|
||||
}
|
||||
|
||||
if abs {
|
||||
res = a.params.PublicURL.String() + res
|
||||
u := *a.params.PublicURL
|
||||
u.Path = res
|
||||
res = u.String()
|
||||
}
|
||||
|
||||
return res
|
||||
@ -88,6 +90,9 @@ func (a *api) tplFuncs() template.FuncMap {
|
||||
"BlogURL": func(path string) string {
|
||||
return a.blogURL(path, false)
|
||||
},
|
||||
"BlogURLAbs": func(path string) string {
|
||||
return a.blogURL(path, true)
|
||||
},
|
||||
"StaticURL": func(path string) string {
|
||||
path = filepath.Join("static", path)
|
||||
return a.blogURL(path, false)
|
||||
|
@ -114,7 +114,7 @@ emailSubscribe.onclick = async () => {
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<a href="{{ BlogURL "feed.xml" }}">{{ BlogURL "feed.xml" }}</a>
|
||||
<a href="{{ BlogURLAbs "feed.xml" }}">{{ BlogURLAbs "feed.xml" }}</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
Loading…
Reference in New Issue
Block a user