apply suggestions

docs/swagger.go

@@ -1,29 +1,25 @@
 package docs
 
 import (
-	"embed"
+	_ "embed"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gotify/location"
 )
 
 //go:embed spec.json
-var box embed.FS
+var spec string
 
 // Serve serves the documentation.
 func Serve(ctx *gin.Context) {
 	base := location.Get(ctx).Host
 	if basePathFromQuery := ctx.Query("base"); basePathFromQuery != "" {
 		base = basePathFromQuery
 	}
-	ctx.Writer.WriteString(get(base))
+	ctx.Writer.WriteString(getSwaggerJSON(base))
 }
 
-func get(base string) string {
-	spec, err := box.ReadFile("spec.json")
-	if err != nil {
-		panic(err)
-	}
-	return strings.Replace(string(spec), "localhost", base, 1)
+func getSwaggerJSON(base string) string {
+	return strings.Replace(spec, "localhost", base, 1)
 }

ui/serve.go

@@ -3,6 +3,7 @@ package ui
 import (
 	"embed"
 	"encoding/json"
+	"io/fs"
 	"net/http"
 	"strings"
 
@@ -19,16 +20,6 @@ type uiConfig struct {
 	Version  model.VersionInfo `json:"version"`
 }
 
-type AddPrefix struct {
-	Prefix       string
-	InnerHandler http.Handler
-}
-
-func (a *AddPrefix) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	r.URL.Path = a.Prefix + r.URL.Path
-	a.InnerHandler.ServeHTTP(w, r)
-}
-
 // Register registers the ui on the root path.
 func Register(r *gin.Engine, version model.VersionInfo, register bool) {
 	uiConfigBytes, err := json.Marshal(uiConfig{Version: version, Register: register})
@@ -42,10 +33,12 @@ func Register(r *gin.Engine, version model.VersionInfo, register bool) {
 	ui.GET("/index.html", serveFile("index.html", "text/html", noop))
 	ui.GET("/manifest.json", serveFile("manifest.json", "application/json", noop))
 	ui.GET("/asset-manifest.json", serveFile("asset-manifest.json", "application/json", noop))
-	ui.GET("/static/*any", gin.WrapH(&AddPrefix{
-		Prefix:       "/build",
-		InnerHandler: http.FileServer(http.FS(box)),
-	}))
+
+	subBox, err := fs.Sub(box, "build")
+	if err != nil {
+		panic(err)
+	}
+	ui.GET("/static/*any", gin.WrapH(http.FileServer(http.FS(subBox))))
 }
 
 func noop(s string) string {