diff --git a/go.mod b/go.mod index 19f3675..1547ce6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.arav.su/Arav/dwelling-home go 1.17 require ( - git.arav.su/Arav/justcaptcha v0.0.0-20230506005225-406fb66c17ca + git.arav.su/Arav/justcaptcha/v2 v2.1.0 git.arav.su/Arav/justguestbook v1.3.2 github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 github.com/pkg/errors v0.9.1 @@ -12,10 +12,10 @@ require ( require ( github.com/fogleman/gg v1.3.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect - golang.org/x/image v0.9.0 // indirect + golang.org/x/image v0.11.0 // indirect ) require ( - git.arav.su/Arav/httpr v0.2.1 + git.arav.su/Arav/httpr v0.3.1 github.com/mattn/go-sqlite3 v1.14.17 // indirect ) diff --git a/go.sum b/go.sum index a3c417b..3fdccc5 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -git.arav.su/Arav/httpr v0.2.1 h1:wtago8iYOqeoyOvio1uhMItXaTHXiBVfsshtYWSURhw= -git.arav.su/Arav/httpr v0.2.1/go.mod h1:z0SVYwe5dBReeVuFU9QH2PmBxICJwchxqY5OfZbeVzU= -git.arav.su/Arav/justcaptcha v0.0.0-20230506005225-406fb66c17ca h1:keam4p+hYktoRNNparpacUS5LMjzFs4ERwHuV/IXqAw= -git.arav.su/Arav/justcaptcha v0.0.0-20230506005225-406fb66c17ca/go.mod h1:eXjBHk26MLvfRZrf3MY29HCIN/YlICklXby0JVkG4oA= +git.arav.su/Arav/httpr v0.3.1 h1:8ba90SJ4XYUWfIlC3V0Zuw3+CcOb9IYVkOZ/2mB9JO0= +git.arav.su/Arav/httpr v0.3.1/go.mod h1:z0SVYwe5dBReeVuFU9QH2PmBxICJwchxqY5OfZbeVzU= +git.arav.su/Arav/justcaptcha/v2 v2.1.0 h1:EFerW2mP60rDczu1mPbJb7DiDeAQOcw83/KiWcxCOKs= +git.arav.su/Arav/justcaptcha/v2 v2.1.0/go.mod h1:Ntab6TUAqCo/H9LSWOd4IQ9ANnp8G1PEygXtORcdTOY= git.arav.su/Arav/justguestbook v1.3.2 h1:B1AzS14dW3bVlp0Qj6pu1PrJlWaPK1mplmx3UNBcxo4= git.arav.su/Arav/justguestbook v1.3.2/go.mod h1:Umo/AzSOKu+OU+03V7/QQ6m6N0nXyeRAGOZT4P5ol98= github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= @@ -10,7 +10,6 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 h1:uK3X/2mt4tbSGoHvbLBHUny7CKiuwUip3MArtukol4E= github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= @@ -19,9 +18,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= -golang.org/x/image v0.9.0 h1:QrzfX26snvCM20hIhBwuHI/ThTg18b/+kcKdXHvnR+g= -golang.org/x/image v0.9.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0= +golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= +golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -44,7 +42,7 @@ 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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/internal/http/api_captcha_handlers.go b/internal/http/api_captcha_handlers.go index 7ae37fc..eb384cd 100644 --- a/internal/http/api_captcha_handlers.go +++ b/internal/http/api_captcha_handlers.go @@ -7,9 +7,9 @@ import ( "time" "git.arav.su/Arav/httpr" - "git.arav.su/Arav/justcaptcha/pkg/captcha" - "git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb" - "git.arav.su/Arav/justcaptcha/pkg/dwcaptcha" + captcha "git.arav.su/Arav/justcaptcha/v2" + "git.arav.su/Arav/justcaptcha/v2/dwcaptcha" + "git.arav.su/Arav/justcaptcha/v2/inmemdb" ) type CaptchaApiHandlers struct { diff --git a/internal/http/api_guestbook_handlers.go b/internal/http/api_guestbook_handlers.go index 68fb6de..1461594 100644 --- a/internal/http/api_guestbook_handlers.go +++ b/internal/http/api_guestbook_handlers.go @@ -6,8 +6,8 @@ import ( "strings" "git.arav.su/Arav/httpr" - "git.arav.su/Arav/justcaptcha/pkg/captcha" - "git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb" + captcha "git.arav.su/Arav/justcaptcha/v2" + "git.arav.su/Arav/justcaptcha/v2/inmemdb" "git.arav.su/Arav/justguestbook" ) diff --git a/internal/http/web_handlers.go b/internal/http/web_handlers.go index 5e6b8e7..1e5ffdb 100644 --- a/internal/http/web_handlers.go +++ b/internal/http/web_handlers.go @@ -12,8 +12,8 @@ import ( "git.arav.su/Arav/dwelling-home/pkg/servicestat" "git.arav.su/Arav/dwelling-home/pkg/util" "git.arav.su/Arav/dwelling-home/web" - "git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb" - "git.arav.su/Arav/justcaptcha/pkg/dwcaptcha" + "git.arav.su/Arav/justcaptcha/v2/dwcaptcha" + "git.arav.su/Arav/justcaptcha/v2/inmemdb" "git.arav.su/Arav/justguestbook" )