diff --git a/go.mod b/go.mod index 2e309c1..29abaf0 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,8 @@ require ( github.com/caarlos0/env/v9 v9.0.0 github.com/google/go-querystring v1.1.0 github.com/grokify/commonchat v0.3.10 - github.com/grokify/gohttp v0.2.7 - github.com/grokify/gonet v0.1.6 - github.com/grokify/mogo v0.62.7 + github.com/grokify/mogo v0.62.8 + github.com/grokify/xgo v0.7.4 github.com/jessevdk/go-flags v1.5.0 github.com/joho/godotenv v1.5.1 github.com/microcosm-cc/bluemonday v1.0.26 @@ -25,7 +24,7 @@ require ( ) require ( - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/caarlos0/env/v6 v6.10.1 // indirect github.com/derekstavis/go-qs v0.0.0-20180720192143-9eef69e6c4e7 // indirect @@ -44,7 +43,7 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index e0025b0..3f3b1de 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apex/gateway v1.1.2 h1:OWyLov8eaau8YhkYKkRuOAYqiUhpBJalBR1o+3FzX+8= github.com/apex/gateway v1.1.2/go.mod h1:AMTkVbz5u5Hvd6QOGhhg0JUrNgCcLVu3XNJOGntdoB4= github.com/aws/aws-lambda-go v1.17.0/go.mod h1:FEwgPLE6+8wcGBTe5cJN3JWurd1Ztm9zN4jsXsjzKKw= @@ -41,12 +41,10 @@ github.com/grokify/commonchat v0.3.10 h1:i+rhn/vjDB/U6eHYP+rVC2FwX4BN+LGlQ5HPzAb github.com/grokify/commonchat v0.3.10/go.mod h1:tz/wt68Ye9vLhMj/Wlji+4EaJfXfYKCZWcANJVBVdKs= github.com/grokify/go-glip v0.5.12 h1:m8uLDnSW9IPXC5AcxLgardNjYeFI3A/zDLi7CZe6u2Q= github.com/grokify/go-glip v0.5.12/go.mod h1:M2hDlcucN4tyRTsKfdyTAhrO/7VZrXBDNK0SUans/h4= -github.com/grokify/gohttp v0.2.7 h1:HU8dXhUQCYKHpy69LqiK8jRYxoLtYUGx0/IZ4u5WwVQ= -github.com/grokify/gohttp v0.2.7/go.mod h1:jcYYSbLkLi+KbGOQfLZbDrhr0yg7uWphybyfJFgZgEA= -github.com/grokify/gonet v0.1.6 h1:Dl/JPhUS2f/2H5vgtIoYODBMye6eFCo50ljBpYbF/ww= -github.com/grokify/gonet v0.1.6/go.mod h1:Nixz+EaUgYOVY3XcEcMZMH2HMYvoi2dLbbUbOTO2IGM= -github.com/grokify/mogo v0.62.7 h1:kaGnLw1yjc5tNOCs8QAcirvOjatn3l4Ct6ywQUz4sRA= -github.com/grokify/mogo v0.62.7/go.mod h1:TSoSr/DFvt0UuEhUgKzGO4psWdiLPgXGcvl5RKE2p2M= +github.com/grokify/mogo v0.62.8 h1:MtEYp8ztObKcya75KhmCQXCPhxdIl+NkBx4H7Yl8BlE= +github.com/grokify/mogo v0.62.8/go.mod h1:bCOMAPs9W6TsC64H847iUmvdMBtqlMKw5g3X4sp+Hko= +github.com/grokify/xgo v0.7.4 h1:UYx+xBUvu5o+K8m49XvKuwqgY42KWwoKoHTieRFZXzY= +github.com/grokify/xgo v0.7.4/go.mod h1:7x+5FG6ZsAUrykDOUasV+kBGJLI9KCVz9aQ/0+Dmpx8= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= @@ -106,8 +104,8 @@ github.com/valyala/quicktemplate v1.7.0 h1:LUPTJmlVcb46OOUY3IeD9DojFpAVbsG+5WFTc github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= -golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= diff --git a/main.go b/main.go index a988c74..ae26061 100644 --- a/main.go +++ b/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/grokify/gohttp/httpsimple" "github.com/grokify/mogo/config" + "github.com/grokify/xgo/net/http/httpsimple" "github.com/grokify/chathooks/pkg/service" ) diff --git a/pkg/handlers/base_handler.go b/pkg/handlers/base_handler.go index 373c108..2493f6d 100644 --- a/pkg/handlers/base_handler.go +++ b/pkg/handlers/base_handler.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/grokify/commonchat" - "github.com/grokify/gohttp/anyhttp" "github.com/grokify/mogo/net/urlutil" + "github.com/grokify/xgo/net/http/anyhttp" "github.com/rs/zerolog/log" "github.com/valyala/fasthttp" diff --git a/pkg/handlers/wootric/wootric_models.go b/pkg/handlers/wootric/wootric_models.go index 334cfcd..4cb7064 100644 --- a/pkg/handlers/wootric/wootric_models.go +++ b/pkg/handlers/wootric/wootric_models.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/grokify/gonet/urlutil" "github.com/grokify/mogo/time/timeutil" "github.com/grokify/mogo/type/maputil" + "github.com/grokify/xgo/net/urlutil" ) type WootricEvent struct { diff --git a/pkg/models/models.go b/pkg/models/models.go index 97f09a9..d6eb051 100644 --- a/pkg/models/models.go +++ b/pkg/models/models.go @@ -10,10 +10,10 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/grokify/commonchat" - "github.com/grokify/gohttp/anyhttp" - fhu "github.com/grokify/gohttp/fasthttputil" hum "github.com/grokify/mogo/net/http/httputilmore" "github.com/grokify/mogo/type/stringsutil" + "github.com/grokify/xgo/net/http/anyhttp" + fhu "github.com/grokify/xgo/net/http/fasthttputil" "github.com/rs/zerolog/log" "github.com/valyala/fasthttp" diff --git a/pkg/service/service.go b/pkg/service/service.go index 651a292..707e039 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -14,8 +14,8 @@ import ( "github.com/buaazp/fasthttprouter" ccglip "github.com/grokify/commonchat/glip" ccslack "github.com/grokify/commonchat/slack" - "github.com/grokify/gohttp/anyhttp" "github.com/grokify/mogo/net/http/httputilmore" + "github.com/grokify/xgo/net/http/anyhttp" "github.com/rs/zerolog/log" "github.com/valyala/fasthttp"