src/cmd/mediocre-blog/main.go

@@ -126,7 +126,6 @@ func main() {
 	gmiParams.Logger = logger.WithNamespace("gmi")
 	gmiParams.PostStore = postStore
 	gmiParams.PostAssetStore = postAssetStore
-	gmiParams.HTTPPublicURL = httpParams.PublicURL
 
 	logger.Info(ctx, "starting gmi api")
 	gmiAPI, err := gmi.New(gmiParams)

src/gmi/gmi.go

@@ -30,8 +30,6 @@ type Params struct {
 	PublicURL        *url.URL
 	ListenAddr       string
 	CertificatesPath string
-
-	HTTPPublicURL *url.URL
 }
 
 // SetupCfg implement the cfg.Cfger interface.

src/gmi/tpl.go

@@ -7,9 +7,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"mime"
 	"net/url"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -35,9 +33,8 @@ type rendererGetPostSeriesNextPreviousRes struct {
 }
 
 type renderer struct {
-	url           *url.URL
-	postStore     post.Store
-	httpPublicURL *url.URL
+	url       *url.URL
+	postStore post.Store
 }
 
 func (r renderer) GetPosts(page, count int) (rendererGetPostsRes, error) {
@@ -101,9 +98,7 @@ func (r renderer) PostBody(p post.StoredPost) (string, error) {
 			return filepath.Join("/posts", id)
 		},
 		StaticURL: func(path string) string {
-			httpPublicURL := *r.httpPublicURL
-			httpPublicURL.Path = filepath.Join(httpPublicURL.Path, "/static", path)
-			return httpPublicURL.String()
+			return filepath.Join("/static", path)
 		},
 		Image: func(args ...string) (string, error) {
 
@@ -196,12 +191,10 @@ func (a *api) tplHandler() (gemini.Handler, error) {
 	) {
 
 		tplPath := strings.TrimPrefix(r.URL.Path, "/")
-		mimeType := mime.TypeByExtension(path.Ext(r.URL.Path))
 
 		ctx = mctx.Annotate(ctx,
 			"url", r.URL,
 			"tplPath", tplPath,
-			"mimeType", mimeType,
 		)
 
 		tpl := allTpls.Lookup(tplPath)
@@ -211,16 +204,11 @@ func (a *api) tplHandler() (gemini.Handler, error) {
 			return
 		}
 
-		if mimeType != "" {
-			rw.SetMediaType(mimeType)
-		}
-
 		buf := new(bytes.Buffer)
 
 		err := tpl.Execute(buf, renderer{
-			url:           r.URL,
-			postStore:     a.params.PostStore,
-			httpPublicURL: a.params.HTTPPublicURL,
+			url:       r.URL,
+			postStore: a.params.PostStore,
 		})
 
 		if err != nil {

src/gmi/tpl/wtfpl.txt

@@ -1,14 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-