From 22bc011be660934ff98ba88daf9e83aa98daec87 Mon Sep 17 00:00:00 2001 From: Thatcher Peskens Date: Sun, 13 Dec 2020 14:27:19 +0100 Subject: [PATCH] Moved 'sponsor' out of response into just template handling --- http/http.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/http.go b/http/http.go index f742c9c..2a125d1 100644 --- a/http/http.go +++ b/http/http.go @@ -54,7 +54,6 @@ type Response struct { ASNOrg string `json:"asn_org,omitempty"` Hostname string `json:"hostname,omitempty"` UserAgent *useragent.UserAgent `json:"user_agent,omitempty"` - Sponsor bool `json:"sponsor"` } type PortResponse struct { @@ -162,7 +161,6 @@ func (s *Server) newResponse(r *http.Request) (Response, error) { ASN: autonomousSystemNumber, ASNOrg: asn.AutonomousSystemOrganization, Hostname: hostname, - Sponsor: s.Sponsor, } s.cache.Set(ip, response) response.UserAgent = userAgentFromRequest(r) @@ -342,6 +340,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro BoxLonRight float64 JSON string Port bool + Sponsor bool }{ response, r.Host, @@ -351,6 +350,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)