diff --git a/go.sum b/go.sum index deb5072..c565698 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/common/common.go b/internal/common/common.go index cd28725..a30b55c 100644 --- a/internal/common/common.go +++ b/internal/common/common.go @@ -114,12 +114,17 @@ func LookupIPData(geoIP *db.GeoIPManager, ip net.IP) *DataStruct { hostname = []string{""} } + var sd *string + if len(cityRecord.Subdivisions) > 0 { + sd = ToPtr(cityRecord.Subdivisions[0].Names["en"]) + } + data := &DataStruct{ IP: ToPtr(ip.String()), Hostname: ToPtr(strings.TrimSuffix(hostname[0], ".")), Org: ToPtr(fmt.Sprintf("AS%d %s", asnRecord.AutonomousSystemNumber, asnRecord.AutonomousSystemOrganization)), City: ToPtr(cityRecord.City.Names["en"]), - Region: ToPtr(cityRecord.Subdivisions[0].Names["en"]), + Region: sd, Country: ToPtr(cityRecord.Country.IsoCode), Timezone: ToPtr(cityRecord.Location.Timezone), Loc: ToPtr(fmt.Sprintf("%.4f,%.4f", cityRecord.Location.Latitude, cityRecord.Location.Longitude)),