From f9bcb9c0b98d5477ca49130177b1bd9779668070 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Sun, 13 Nov 2022 04:26:41 +0100 Subject: [PATCH] Update dependencies --- context.go | 2 +- gctest/gctest_test.go | 16 ++++++++-------- go.mod | 22 ++++++++++++---------- go.sum | 38 ++++++++++++++++++++------------------ handlers/count_test.go | 21 +++++++++++---------- hit_test.go | 11 +++++------ ref.go | 2 +- tpl_test.go | 2 +- user.go | 2 +- 9 files changed, 60 insertions(+), 56 deletions(-) diff --git a/context.go b/context.go index eb9b8622b..f363a088e 100644 --- a/context.go +++ b/context.go @@ -17,7 +17,7 @@ import ( // Version of GoatCounter; set at compile-time with: // -// -ldflags="-X zgo.at/goatcounter/v2.Version=XXXX" +// -ldflags="-X zgo.at/goatcounter/v2.Version=…" var Version = "dev" diff --git a/gctest/gctest_test.go b/gctest/gctest_test.go index 96f7a71d7..3607a7b77 100644 --- a/gctest/gctest_test.go +++ b/gctest/gctest_test.go @@ -64,14 +64,14 @@ func TestSite(t *testing.T) { } { - s := goatcounter.Site{Cname: ztype.Ptr("XXX.XXX")} - u := goatcounter.User{Email: "XXX@XXX.XXX"} + s := goatcounter.Site{Cname: ztype.Ptr("AAA.AAA")} + u := goatcounter.User{Email: "AAA@AAA.AAA"} Site(ctx, t, &s, &u) - if s.ID == 0 || *s.Cname != "XXX.XXX" { + if s.ID == 0 || *s.Cname != "AAA.AAA" { t.Error() } - if u.ID == 0 || u.Email != "XXX@XXX.XXX" { + if u.ID == 0 || u.Email != "AAA@AAA.AAA" { t.Error() } @@ -81,11 +81,11 @@ func TestSite(t *testing.T) { site_id cname 1 gctest.localhost 2 NULL - 3 XXX.XXX + 3 AAA.AAA user_id site_id email 1 1 test@gctest.localhost 2 2 test@example.com - 3 3 XXX@XXX.XXX` + 3 3 AAA@AAA.AAA` if d := zdb.Diff(got, want); d != "" { t.Error(d) } @@ -99,12 +99,12 @@ func TestSite(t *testing.T) { site_id cname 1 gctest.localhost 2 NULL - 3 XXX.XXX + 3 AAA.AAA 4 NULL user_id site_id email 1 1 test@gctest.localhost 2 2 test@example.com - 3 3 XXX@XXX.XXX + 3 3 AAA@AAA.AAA 4 4 test@example.com` if d := zdb.Diff(got, want); d != "" { t.Error(d) diff --git a/go.mod b/go.mod index e7045e134..42a56872c 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,13 @@ module zgo.at/goatcounter/v2 go 1.19 +replace zgo.at/bgrun => ../Golib/bgrun + require ( code.soquee.net/otp v0.0.4 github.com/BurntSushi/toml v1.2.1 github.com/PuerkitoBio/goquery v1.8.0 - github.com/bmatcuk/doublestar/v4 v4.2.0 + github.com/bmatcuk/doublestar/v4 v4.4.0 github.com/boombuler/barcode v1.0.1 github.com/go-chi/chi/v5 v5.0.7 github.com/google/uuid v1.3.0 @@ -16,10 +18,10 @@ require ( github.com/oschwald/geoip2-golang v1.4.0 github.com/russross/blackfriday/v2 v2.1.0 github.com/teamwork/reload v1.4.2 - golang.org/x/crypto v0.1.0 - golang.org/x/exp v0.0.0-20221019170559-20944726eadf + golang.org/x/crypto v0.2.0 + golang.org/x/exp v0.0.0-20221111204811-129d8d6c17ab golang.org/x/image v0.1.0 - golang.org/x/net v0.1.0 + golang.org/x/net v0.2.0 golang.org/x/sync v0.1.0 golang.org/x/text v0.4.0 zgo.at/blackmail v0.0.0-20221021025740-b3fdfc32a1aa @@ -34,12 +36,12 @@ require ( zgo.at/z18n v0.0.0-20221020022658-4ea64eeb51d9 zgo.at/zcache v1.2.0 zgo.at/zcache/v2 v2.1.0 - zgo.at/zdb v0.0.0-20221026193338-d7af3d85e31a + zgo.at/zdb v0.0.0-20221105060706-d862504dc723 zgo.at/zhttp v0.0.0-20221020124111-c3011d53484c zgo.at/zli v0.0.0-20221012220610-d6a5a841b943 zgo.at/zlog v0.0.0-20211008102840-46c1167bf2a9 zgo.at/zprof v0.0.0-20211217104121-c3c12596d8f0 - zgo.at/zstd v0.0.0-20221031120442-2f4b628d1acb + zgo.at/zstd v0.0.0-20221107175747-9855306d942d zgo.at/ztpl v0.0.0-20221020022020-7d727686f6a2 zgo.at/zvalidate v0.0.0-20221021025449-cb54fa8efade ) @@ -57,8 +59,8 @@ require ( github.com/mattn/go-runewidth v0.0.13 // indirect github.com/oschwald/maxminddb-golang v1.10.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/term v0.1.0 // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/mod v0.6.0 // indirect + golang.org/x/sys v0.2.0 // indirect + golang.org/x/term v0.2.0 // indirect + golang.org/x/tools v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index 21efe391a..21b76e7c1 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/arp242/geoip2-golang v1.4.1-0.20220825052315-37df63691c60 h1:rjfH4qDB github.com/arp242/geoip2-golang v1.4.1-0.20220825052315-37df63691c60/go.mod h1:R7bRvYjOeaoenAp9sKRS8GX5bJWcZ0laWO5+DauEktw= github.com/arp242/maxminddb-golang v1.8.1-0.20221021031716-eb1bbbb3fc5d h1:pYlDUZV4i+d3roLHQcouOUjqYKDvNwfnNWate7btDnw= github.com/arp242/maxminddb-golang v1.8.1-0.20221021031716-eb1bbbb3fc5d/go.mod h1:RG0BzzVtEvvYxYdJK8AeSiwXlmaDDMOh+eQjHwpK5LY= -github.com/bmatcuk/doublestar/v4 v4.2.0 h1:Qu+u9wR3Vd89LnlLMHvnZ5coJMWKQamqdz9/p5GNthA= -github.com/bmatcuk/doublestar/v4 v4.2.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.4.0 h1:LmAwNwhjEbYtyVLzjcP/XeVw4nhuScHGkF/XWXnvIic= +github.com/bmatcuk/doublestar/v4 v4.4.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -43,20 +43,21 @@ github.com/teamwork/reload v1.4.2/go.mod h1:tGCBzttv2CSfSjBTRlIdnQ4kopxrCXPGCTXe github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/exp v0.0.0-20221019170559-20944726eadf h1:nFVjjKDgNY37+ZSYCJmtYf7tOlfQswHqplG2eosjOMg= -golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE= +golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/exp v0.0.0-20221111204811-129d8d6c17ab h1:1S7USr8/C0Sgk4egxq4zZ07zYt2Xh1IiFp8hUMXH/us= +golang.org/x/exp v0.0.0-20221111204811-129d8d6c17ab/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk= golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= @@ -68,13 +69,13 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -83,8 +84,9 @@ golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= zgo.at/blackmail v0.0.0-20221021025740-b3fdfc32a1aa h1:0Hk0Ckgqz1LDp2rbyopdn0y1zsKp3eIWZRc3YEevxB8= @@ -112,8 +114,8 @@ zgo.at/zcache v1.2.0 h1:++0dNWOrmUBa10WSja+eHx5bEO2PzZLRY6MJlBD47yk= zgo.at/zcache v1.2.0/go.mod h1:xWQo2ha/bamTmx8CbfrZl9Nf8AoT5uNh2hWfbQi8TiE= zgo.at/zcache/v2 v2.1.0 h1:USo+ubK+R4vtjw4viGzTe/zjXyPw6R7SK/RL3epBBxs= zgo.at/zcache/v2 v2.1.0/go.mod h1:gyCeoLVo01QjDZynjime8xUGHHMbsLiPyUTBpDGd4Gk= -zgo.at/zdb v0.0.0-20221026193338-d7af3d85e31a h1:AVVYaQtpRVfuMfkCsRpwh7X9Bpox49u0IEJXi34uJJQ= -zgo.at/zdb v0.0.0-20221026193338-d7af3d85e31a/go.mod h1:+0BUrgohOA8NFMGJbKP4xzir+yahdaX9iW9g0X4iZwA= +zgo.at/zdb v0.0.0-20221105060706-d862504dc723 h1:c9UkFNTyeNAQim9HzMz0SSzJGCvOc+0doN6kDp5qlMo= +zgo.at/zdb v0.0.0-20221105060706-d862504dc723/go.mod h1:+0BUrgohOA8NFMGJbKP4xzir+yahdaX9iW9g0X4iZwA= zgo.at/zhttp v0.0.0-20221020124111-c3011d53484c h1:1vPtmRRqkrqLGmjiCKm42rLnpQAdXRCuth86G3114ko= zgo.at/zhttp v0.0.0-20221020124111-c3011d53484c/go.mod h1:ZAV61eMVPCk9Dk9w+k+OS4gqjlCZEdHqOJeSewLzpd0= zgo.at/zli v0.0.0-20221012220610-d6a5a841b943 h1:PeTHjJK0YmNdkwfglLXufJWEwjy2rGujj5DRWtDw0u8= @@ -123,8 +125,8 @@ zgo.at/zlog v0.0.0-20211008102840-46c1167bf2a9/go.mod h1:2Pa5cqKA/6S9FrMFeNowtHP zgo.at/zprof v0.0.0-20211217104121-c3c12596d8f0 h1:nUshmGDnI3+N1OeU265xaqR6weTN2xgrqls8nrkGzbA= zgo.at/zprof v0.0.0-20211217104121-c3c12596d8f0/go.mod h1:JqClLxeT9Uui3apqyN3U6KryFanocqM7E3X4Gle2FAU= zgo.at/zstd v0.0.0-20221013104704-16fa49fadc62/go.mod h1:o/Q8+EtSahHnfkbB3t8wXE0FnoDTmJ0sBDlzezv9XeM= -zgo.at/zstd v0.0.0-20221031120442-2f4b628d1acb h1:esjl+VFRpHMsCmHky62D3fXjkN3u2pfH+2tshjXrCGo= -zgo.at/zstd v0.0.0-20221031120442-2f4b628d1acb/go.mod h1:o/Q8+EtSahHnfkbB3t8wXE0FnoDTmJ0sBDlzezv9XeM= +zgo.at/zstd v0.0.0-20221107175747-9855306d942d h1:w3uykAe47ildkgpNzs3hc8GQ8W/e77inCDNjtKZxy3o= +zgo.at/zstd v0.0.0-20221107175747-9855306d942d/go.mod h1:o/Q8+EtSahHnfkbB3t8wXE0FnoDTmJ0sBDlzezv9XeM= zgo.at/ztpl v0.0.0-20221020022020-7d727686f6a2 h1:2lr9m+2ZzVl3Z5RyyQFaLU9qJ5Qqme6d+o3DOwAVUac= zgo.at/ztpl v0.0.0-20221020022020-7d727686f6a2/go.mod h1:Mm3yhXeuH0S9qzQ4TS69OK5A4yP5R+PXrqWGj3OFsTc= zgo.at/zvalidate v0.0.0-20221021025449-cb54fa8efade h1:eT6K9Iv+U3IPAmJVDCoRMbkbXL4NVeB0HaFob5J/hE0= diff --git a/handlers/count_test.go b/handlers/count_test.go index cc9b5deaf..4d3fe9663 100644 --- a/handlers/count_test.go +++ b/handlers/count_test.go @@ -21,6 +21,7 @@ import ( "zgo.at/zstd/zjson" "zgo.at/zstd/ztest" "zgo.at/zstd/ztime" + "zgo.at/zstd/ztype" ) func TestBackendCount(t *testing.T) { @@ -56,38 +57,38 @@ func TestBackendCount(t *testing.T) { {"ref", url.Values{"p": {"/foo.html"}, "r": {"https://example.com"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", Ref: "example.com", - RefScheme: ztest.SP("h"), + RefScheme: ztype.Ptr("h"), }}, {"str ref", url.Values{"p": {"/foo.html"}, "r": {"example"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", Ref: "example", - RefScheme: ztest.SP("o"), + RefScheme: ztype.Ptr("o"), }}, {"ref params", url.Values{"p": {"/foo.html"}, "r": {"https://example.com?p=x"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", Ref: "example.com", - RefScheme: ztest.SP("h"), + RefScheme: ztype.Ptr("h"), }}, {"full", url.Values{"p": {"/foo.html"}, "t": {"XX"}, "r": {"https://example.com?p=x"}, "s": {"40,50,1"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", Title: "XX", Ref: "example.com", - RefScheme: ztest.SP("h"), + RefScheme: ztype.Ptr("h"), Size: goatcounter.Floats{40, 50, 1}, }}, - {"campaign", url.Values{"p": {"/foo.html"}, "q": {"ref=XXX"}}, nil, 200, goatcounter.Hit{ + {"campaign", url.Values{"p": {"/foo.html"}, "q": {"ref=AAA"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", - Ref: "XXX", - RefScheme: ztest.SP("c"), + Ref: "AAA", + RefScheme: ztype.Ptr("c"), }}, - {"campaign_override", url.Values{"p": {"/foo.html?ref=AAA"}, "q": {"ref=XXX"}}, nil, 200, goatcounter.Hit{ + {"campaign_override", url.Values{"p": {"/foo.html?ref=AAA"}, "q": {"ref=AAA"}}, nil, 200, goatcounter.Hit{ Path: "/foo.html", - Ref: "XXX", - RefScheme: ztest.SP("c"), + Ref: "AAA", + RefScheme: ztype.Ptr("c"), }}, {"bot", url.Values{"p": {"/a"}, "b": {"150"}}, nil, 200, goatcounter.Hit{ diff --git a/hit_test.go b/hit_test.go index 9b7a9f92d..57ac6e549 100644 --- a/hit_test.go +++ b/hit_test.go @@ -10,7 +10,6 @@ import ( . "zgo.at/goatcounter/v2" "zgo.at/goatcounter/v2/gctest" - "zgo.at/zstd/ztest" "zgo.at/zstd/ztype" ) @@ -24,7 +23,7 @@ func dayStat(days map[int]int) []int { func TestHitDefaultsRef(t *testing.T) { a := "arp242.net" - set := ztest.SP("_") + set := ztype.Ptr("_") tests := []struct { in string @@ -39,14 +38,14 @@ func TestHitDefaultsRef(t *testing.T) { // Split out query parameters. {"https://arp242.net", a, nil, nil, "h"}, - {"https://arp242.net?a=b", a, ztest.SP("a=b"), nil, "h"}, - {"https://arp242.net?a=b&c=d", a, ztest.SP("a=b&c=d"), nil, "h"}, + {"https://arp242.net?a=b", a, ztype.Ptr("a=b"), nil, "h"}, + {"https://arp242.net?a=b&c=d", a, ztype.Ptr("a=b&c=d"), nil, "h"}, // Clean up query parameters. {"https://t.co/asd", "twitter.com/search?q=https%3A%2F%2Ft.co%2Fasd", nil, nil, "h"}, {"https://t.co/asd?amp=1", "twitter.com/search?q=https%3A%2F%2Ft.co%2Fasd", nil, nil, "h"}, {"https://arp242.net?utm_source=asd", a, nil, set, "h"}, - {"https://arp242.net?utm_source=asd&a=b", a, ztest.SP("a=b"), set, "h"}, + {"https://arp242.net?utm_source=asd&a=b", a, ztype.Ptr("a=b"), set, "h"}, // Groups {"https://mail.google.com?a=b&c=d", "Email", nil, set, "g"}, @@ -54,7 +53,7 @@ func TestHitDefaultsRef(t *testing.T) { // Host aliases. {"https://en.m.wikipedia.org/wiki/Foo", "en.wikipedia.org/wiki/Foo", nil, set, "h"}, - {"https://en.m.wikipedia.org/wiki/Foo?a=b", "en.wikipedia.org/wiki/Foo", ztest.SP("a=b"), set, "h"}, + {"https://en.m.wikipedia.org/wiki/Foo?a=b", "en.wikipedia.org/wiki/Foo", ztype.Ptr("a=b"), set, "h"}, // Reddit Cleaning. {"https://www.reddit.com/r/programming/top", "www.reddit.com/r/programming", nil, set, "h"}, diff --git a/ref.go b/ref.go index f77e475b4..922384c19 100644 --- a/ref.go +++ b/ref.go @@ -135,7 +135,7 @@ func cleanRefURL(ref string, refURL *url.URL) (string, bool) { // getpocket.com/a/read/2580004052 // getpocket.com/recommendations // getpocket.com/redirect - // getpocket.com/users/XXX/feed/read + // getpocket.com/users/AAA/feed/read if refURL.Host == "getpocket.com" || refURL.Host == "app.getpocket.com" { return "getpocket.com", false } diff --git a/tpl_test.go b/tpl_test.go index 789816dd1..cbf3dbdba 100644 --- a/tpl_test.go +++ b/tpl_test.go @@ -57,7 +57,7 @@ func TestTpl(t *testing.T) { NumRows: ip(42), Size: sp("42"), LastHitID: i64p(642051), - Hash: sp("sha256-XXX"), + Hash: sp("sha256-AAA"), }}}, } diff --git a/user.go b/user.go index 4c6f45e35..84cf9063e 100644 --- a/user.go +++ b/user.go @@ -619,7 +619,7 @@ func (u *UserAccesses) Scan(v interface{}) error { case string: return json.Unmarshal([]byte(vv), u) default: - return fmt.Errorf("XXX.Scan: unsupported type: %T", v) + return fmt.Errorf("UserAccesses.Scan: unsupported type: %T", v) } }