tjp
/
sr-71
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases 1 Wiki Activity

opt-in AutoAtom support for gemini

This commit is contained in:
tjpcc 2023-09-07 12:58:17 -06:00
parent 45565e27f1
commit 030d05d57a
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.go
View File

@ -24,6 +24,8 @@ type config struct {
privilegedUsers []string
fingerResponses map[string]string
geminiAutoAtom bool
}
func configure() config {
@ -38,6 +40,11 @@ func configure() config {
fingers[strings.ToLower(key[7:])] = val
}
autoatom, err := strconv.ParseBool(os.Getenv("GEMINI_AUTOATOM"))
if err != nil {
autoatom = false
}
return config{
hostname: os.Getenv("HOST_NAME"),
geminiRoot: os.Getenv("GEMINI_ROOT"),
@ -48,6 +55,8 @@ func configure() config {
privilegedUsers: privileged,
fingerResponses: fingers,
geminiAutoAtom: autoatom,
}
}

4
go.mod
View File

@ -2,9 +2,9 @@ module tildegit.org/tjp/sr-71
go 1.19
require tildegit.org/tjp/sliderule v1.0.1-0.20230509200833-d7ffcc43d12c
require tildegit.org/tjp/sliderule v1.2.0
require (
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
)

4
go.sum
View File

@ -3,8 +3,12 @@ github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
tildegit.org/tjp/sliderule v1.0.1-0.20230509200833-d7ffcc43d12c h1:SNZW29TADL5Kl+ysr8mUg8GNf6ftKaaVEkp8gI6kHfc=
tildegit.org/tjp/sliderule v1.0.1-0.20230509200833-d7ffcc43d12c/go.mod h1:opdo8E25iS9X9pNismM8U7pCH8XO0PdRIIhdADn8Uik=
tildegit.org/tjp/sliderule v1.2.0 h1:DsULRA+FTSoyMmA488rNfdYJa5iX8eUrSmlNSHKggfI=
tildegit.org/tjp/sliderule v1.2.0/go.mod h1:opdo8E25iS9X9pNismM8U7pCH8XO0PdRIIhdADn8Uik=

8
routes.go
View File

@ -15,6 +15,7 @@ import (
"tildegit.org/tjp/sliderule/contrib/tlsauth"
"tildegit.org/tjp/sliderule/finger"
"tildegit.org/tjp/sliderule/gemini"
"tildegit.org/tjp/sliderule/gemini/gemtext"
"tildegit.org/tjp/sliderule/logging"
)
@ -55,7 +56,12 @@ func geminiRouter(conf config) sr.Handler {
)),
)
return router.Handler()
h := router.Handler()
if conf.geminiAutoAtom {
h = gemtext.AutoAtom(h)
}
return h
}
func gopherRouter(conf config) sr.Handler {