mstar/linstrom
1
0
Fork 0
Code Issues 27 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove one of the duck embeds, go mod tidy
Some checks failed
/ docker (push) Failing after 32s
Details

Browse source 
Seriously, why did I still have the duck image embedded twice when only
the fs embed was used?
This commit is contained in:
Melody Becker 2025-06-11 16:19:25 +02:00
parent 9afb2d36f0
commit 1169cd74a0
Signed by: mstar
SSH key fingerprint: SHA256:9VAo09aaVNTWKzPW7Hq2LW+ox9OdwmTSHRoD4mlz1yI
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -14,6 +14,7 @@ require (
github.com/jackc/pgx/v5 v5.7.4 github.com/jackc/pgx/v5 v5.7.4
github.com/kohkimakimoto/gluatemplate v0.0.0-20160815033744-d9e2c9d6b00f github.com/kohkimakimoto/gluatemplate v0.0.0-20160815033744-d9e2c9d6b00f
github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf
github.com/minio/minio-go/v7 v7.0.92
github.com/mitchellh/mapstructure v1.5.0 github.com/mitchellh/mapstructure v1.5.0
github.com/nrednav/cuid2 v1.0.1 github.com/nrednav/cuid2 v1.0.1
github.com/pquerna/otp v1.4.0 github.com/pquerna/otp v1.4.0
@ -68,7 +69,6 @@ require (
github.com/miekg/dns v1.1.64 // indirect github.com/miekg/dns v1.1.64 // indirect
github.com/minio/crc64nvme v1.0.1 // indirect github.com/minio/crc64nvme v1.0.1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.92 // indirect
github.com/onsi/ginkgo/v2 v2.9.5 // indirect github.com/onsi/ginkgo/v2 v2.9.5 // indirect
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/qpack v0.5.1 // indirect

4
main.go
View file

@ -34,9 +34,6 @@ import (
//go:embed frontend-noscript //go:embed frontend-noscript
// var nojsFS embed.FS // var nojsFS embed.FS
//go:embed duck.webp
var defaultDuck string
//go:embed duck.webp //go:embed duck.webp
var duckFS embed.FS var duckFS embed.FS
@ -131,7 +128,6 @@ func newServer() {
} }
public := webpublic.New( public := webpublic.New(
fmt.Sprintf(":%v", config.GlobalConfig.General.PrivatePort), fmt.Sprintf(":%v", config.GlobalConfig.General.PrivatePort),
&defaultDuck,
duckFS, duckFS,
) )
go func() { go func() {

7
web/public/server.go
View file

@ -46,7 +46,7 @@ type Server struct {
quicServer *http3.Server quicServer *http3.Server
} }
func New(addr string, duckImg *string, duckFs fs.FS) *Server { func New(addr string, duckFs fs.FS) *Server {
handler := http.NewServeMux() handler := http.NewServeMux()
handler.Handle("/api/", http.StripPrefix("/api", api.BuildApiRouter())) handler.Handle("/api/", http.StripPrefix("/api", api.BuildApiRouter()))
handler.HandleFunc("GET /.well-known/webfinger", api.WellKnownWebfinger) handler.HandleFunc("GET /.well-known/webfinger", api.WellKnownWebfinger)
@ -54,8 +54,8 @@ func New(addr string, duckImg *string, duckFs fs.FS) *Server {
handler.HandleFunc("GET /nodeinfo/2.1", api.NodeInfo21) handler.HandleFunc("GET /nodeinfo/2.1", api.NodeInfo21)
handler.HandleFunc("GET /nodeinfo/2.0", api.NodeInfo20) handler.HandleFunc("GET /nodeinfo/2.0", api.NodeInfo20)
handler.HandleFunc("GET /errors/{name}", errorTypeHandler) handler.HandleFunc("GET /errors/{name}", errorTypeHandler)
handler.HandleFunc("GET /default-image", buildServeDefaultImage(duckImg, duckFs)) handler.HandleFunc("GET /default-image", buildServeDefaultImage(duckFs))
handler.HandleFunc("GET /default-image.webp", buildServeDefaultImage(duckImg, duckFs)) handler.HandleFunc("GET /default-image.webp", buildServeDefaultImage(duckFs))
rootHandler := webutils.ChainMiddlewares( rootHandler := webutils.ChainMiddlewares(
handler, handler,
webutils.BuildLoggingMiddleware( webutils.BuildLoggingMiddleware(
@ -145,7 +145,6 @@ func (s *Server) Stop() error {
} }
func buildServeDefaultImage( func buildServeDefaultImage(
duckImg *string,
duckFs fs.FS, duckFs fs.FS,
) func(w http.ResponseWriter, r *http.Request) { ) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {