ProfessionalUwU/echoip
1
0
Fork 0
mirror of https://github.com/mpolden/echoip.git synced 2025-06-29 14:17:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

New template (#121)

Browse Source
This commit is contained in:
Thatcher
2020-12-14 19:02:35 +01:00
committed by GitHub
parent 762f454865
commit ab8f90431b
11 changed files with 640 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http/http.go
View File

@ -34,6 +34,7 @@ type Server struct {
cache *Cache
gr geo.Reader
profile bool
Sponsor bool
}
type Response struct {
@ -322,7 +323,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
if err != nil {
return badRequest(err).WithMessage(err.Error())
}
t, err := template.ParseFiles(s.Template)
t, err := template.ParseGlob(s.Template + "/*")
if err != nil {
return internalServerError(err)
}
@ -330,6 +331,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
if err != nil {
return internalServerError(err)
}
var data = struct {
Response
Host string
@ -339,6 +341,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
BoxLonRight float64
JSON string
Port bool
Sponsor bool
}{
response,
r.Host,
@ -348,6 +351,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
response.Longitude + 0.05,
string(json),
s.LookupPort != nil,
s.Sponsor,
}
if err := t.Execute(w, &data); err != nil {
return internalServerError(err)