From 1cfdac5e8c2ac802275cb29ae9149c55547f38fb Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Sun, 22 Jan 2023 12:09:50 +0100
Subject: Allow url construction to work if blog is under a sub-path

---
 src/http/tpl.go          | 9 +++++++--
 src/http/tpl/follow.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/http')

diff --git a/src/http/tpl.go b/src/http/tpl.go
index f49232a..5fc54f3 100644
--- a/src/http/tpl.go
+++ b/src/http/tpl.go
@@ -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)
diff --git a/src/http/tpl/follow.html b/src/http/tpl/follow.html
index eabf8ea..c0e4980 100644
--- a/src/http/tpl/follow.html
+++ b/src/http/tpl/follow.html
@@ -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>
-- 
cgit v1.2.3