use go-lib in git.ptzo.gdn (#163)

Reviewed-on: #163
Co-authored-by: Tyr Mactire <tyr@pettingzoo.co>
Co-committed-by: Tyr Mactire <tyr@pettingzoo.co>

Jenkinsfile

@@ -68,6 +68,12 @@ pipeline {
           reuseNode true
         }
       }
+      when {
+        anyOf {
+          changeRequest()
+          branch 'devel'
+        }
+      }
       steps {
         script {
           sh '/go/bin/goreleaser build --rm-dist --snapshot'

cmd/relay/action/account/modify.go

@@ -2,7 +2,7 @@ package account
 
 import (
 	"context"
-	"github.com/feditools/go-lib"
+	"git.ptzo.gdn/feditools/go-lib"
 	"git.ptzo.gdn/feditools/relay/cmd/relay/action"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db/bun"

cmd/relay/action/server/http_server.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"context"
-	"github.com/feditools/go-lib"
+	"git.ptzo.gdn/feditools/go-lib"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/fedi"

go.mod

@@ -3,10 +3,10 @@ module git.ptzo.gdn/feditools/relay
 go 1.19
 
 require (
+	git.ptzo.gdn/feditools/go-lib v0.18.3
 	github.com/allegro/bigcache/v3 v3.0.2
 	github.com/contribsys/faktory v1.6.2
 	github.com/contribsys/faktory_worker_go v1.6.0
-	github.com/feditools/go-lib v0.18.2
 	github.com/go-co-op/gocron v1.18.0
 	github.com/go-fed/activity v1.0.0
 	github.com/go-fed/httpsig v1.1.0
@@ -64,7 +64,7 @@ require (
 	github.com/go-redis/redis/extra/rediscmd/v8 v8.11.5 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -82,7 +82,7 @@ require (
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-mastodon v0.0.5-0.20211214115546-7745e19ff787 // indirect
+	github.com/mattn/go-mastodon v0.0.5 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -117,7 +117,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.11.1 // indirect
 	go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/crypto v0.1.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/tools v0.1.12 // indirect

go.sum

@@ -36,6 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+git.ptzo.gdn/feditools/go-lib v0.18.3 h1:4ZJeeMwS4Lsk++4oaKh+FzSzkd/7zOnNSrAsWKH4cKE=
+git.ptzo.gdn/feditools/go-lib v0.18.3/go.mod h1:AjT/r7wnZzZqU//GEQ1YGwepx1Pt7BIILTG4edoY+Uw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -43,7 +45,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -53,7 +54,6 @@ github.com/allegro/bigcache/v3 v3.0.2 h1:AKZCw+5eAaVyNTBmI2fgyPVJhHkdWder3O9Irpr
 github.com/allegro/bigcache/v3 v3.0.2/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -87,8 +87,6 @@ github.com/contribsys/faktory_worker_go v1.6.0 h1:ov69BLHL62i/wRLJwvuj5UphwgjMOI
 github.com/contribsys/faktory_worker_go v1.6.0/go.mod h1:XMNGn3sBJdqFGfTH4SkmYkMovhdkq5cDJj36wowfbNY=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -111,8 +109,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/feditools/go-lib v0.18.2 h1:6+b+E+kmRcEc77NrLLS9LSEdIohxUqJ7cBfxOhFOhMk=
-github.com/feditools/go-lib v0.18.2/go.mod h1:3WfZn40TYUBa3AgblR0dBlzHj+imNv5ME7eEVqtURXY=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -246,8 +242,8 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+
 github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 h1:kr3j8iIMR4ywO/O0rvksXaJvauGGCMg2zAZIiNZ9uIQ=
@@ -353,26 +349,20 @@ github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamh
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-mastodon v0.0.5-0.20211214115546-7745e19ff787 h1:5CxQvPUr7Aupo8RFBcJM6A3yuK491j7WEx/jgQY/zr0=
-github.com/mattn/go-mastodon v0.0.5-0.20211214115546-7745e19ff787/go.mod h1:D8ScK24P+nSB6g5xdsi/m40TIWispU4yyhJw9rGgHx4=
-github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-mastodon v0.0.5 h1:P0e1/R2v3ho6kM7BUW0noQm8gAqHE0p8Gq1TMapIVAc=
+github.com/mattn/go-mastodon v0.0.5/go.mod h1:cg7RFk2pcUfHZw/IvKe1FUzmlq5KnLFqs7eV2PHplV8=
 github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -458,13 +448,11 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -530,7 +518,6 @@ github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.15 h1:s6BZwhj/2oZ9GSkfcTH
 github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.15/go.mod h1:aZXwJzbTHnhh8vpd1bPjK68iTuNEtfvpHcJq73FdmhQ=
 github.com/uptrace/uptrace-go v1.11.4 h1:BZWpzr2yhwFvmOLsRG97hgs60xYwaTnGFx2zPl///Gs=
 github.com/uptrace/uptrace-go v1.11.4/go.mod h1:AwD14IBYEip4q21cxks+CsNkEINWsKpsLd8AS8HFdMs=
-github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.40.0 h1:CRq/00MfruPGFLTQKY8b+8SfdK60TxNztjRMnH0t1Yc=
@@ -614,8 +601,9 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+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-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -691,8 +679,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -742,7 +728,6 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -782,9 +767,7 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

internal/db/bun/account.go

@@ -3,7 +3,7 @@ package bun
 import (
 	"context"
 	"database/sql"
-	libdatabase "github.com/feditools/go-lib/database"
+	libdatabase "git.ptzo.gdn/feditools/go-lib/database"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"github.com/uptrace/bun"

internal/db/bun/block.go

@@ -2,7 +2,7 @@ package bun
 
 import (
 	"context"
-	libdatabase "github.com/feditools/go-lib/database"
+	libdatabase "git.ptzo.gdn/feditools/go-lib/database"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"github.com/uptrace/bun"

internal/db/bun/instance.go

@@ -3,7 +3,7 @@ package bun
 import (
 	"context"
 	"fmt"
-	libdatabase "github.com/feditools/go-lib/database"
+	libdatabase "git.ptzo.gdn/feditools/go-lib/database"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"github.com/uptrace/bun"

internal/db/bun/log_entry.go

@@ -2,7 +2,7 @@ package bun
 
 import (
 	"context"
-	libdatabase "github.com/feditools/go-lib/database"
+	libdatabase "git.ptzo.gdn/feditools/go-lib/database"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"github.com/uptrace/bun"

internal/db/cachemem/account.go

@@ -6,9 +6,9 @@ import (
 	"encoding/binary"
 	"encoding/gob"
 	"errors"
-	"github.com/allegro/bigcache/v3"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
+	"github.com/allegro/bigcache/v3"
 	"strconv"
 	"strings"
 	"time"

internal/db/cachemem/cache_mem.go

@@ -3,9 +3,9 @@ package cachemem
 import (
 	"context"
 	"encoding/gob"
-	"github.com/allegro/bigcache/v3"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
+	"github.com/allegro/bigcache/v3"
 	"go.opentelemetry.io/otel"
 	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
 	"go.opentelemetry.io/otel/trace"

internal/fedi/fedi.go

@@ -2,8 +2,8 @@ package fedi
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
-	"github.com/feditools/go-lib/fedihelper/mastodon"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper/mastodon"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/kv"

internal/fedi/handler.go

@@ -3,7 +3,7 @@ package fedi
 import (
 	"context"
 	"errors"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )

internal/http/activitypub/actor.go

@@ -2,8 +2,8 @@ package activitypub
 
 import (
 	"encoding/json"
-	"github.com/feditools/go-lib/fedihelper"
-	libhttp "github.com/feditools/go-lib/http"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/path"
 	"net/http"
 )

internal/http/activitypub/inbox.go

@@ -3,7 +3,7 @@ package activitypub
 import (
 	"encoding/json"
 	"errors"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	nethttp "net/http"

internal/http/activitypub/middleware.go

@@ -2,7 +2,7 @@ package activitypub
 
 import (
 	"context"
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"github.com/go-fed/httpsig"
 	nethttp "net/http"
 	"net/url"

internal/http/activitypub/nodeinfo.go

@@ -2,8 +2,8 @@ package activitypub
 
 import (
 	"encoding/json"
-	"github.com/feditools/go-lib"
-	libhttp "github.com/feditools/go-lib/http"
+	"git.ptzo.gdn/feditools/go-lib"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/path"
 	"net/http"
 )

internal/http/activitypub/webfinger.go

@@ -3,8 +3,8 @@ package activitypub
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/feditools/go-lib/fedihelper"
-	libhttp "github.com/feditools/go-lib/http"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/path"
 	"net/http"
 )

internal/http/middleware.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"github.com/gorilla/handlers"
 	"github.com/sirupsen/logrus"
 	"github.com/slok/go-http-metrics/middleware/std"

internal/http/robots/robots.go

@@ -2,7 +2,7 @@ package robots
 
 import (
 	"errors"
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	ihttp "git.ptzo.gdn/feditools/relay/internal/http"

internal/http/server.go

@@ -3,7 +3,7 @@ package http
 import (
 	"context"
 	"fmt"
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"github.com/gorilla/mux"
 	metrics "github.com/slok/go-http-metrics/metrics/prometheus"

internal/http/template/admin_account.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/admin_block.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/admin_home.go

@@ -1,6 +1,6 @@
 package template
 
-import libtemplate "github.com/feditools/go-lib/template"
+import libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 
 // AdminHomeName is the name of the admin home template.
 const AdminHomeName = "admin_home"

internal/http/template/admin_instance.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/admin_instance_view.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/admin_jobs.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/logic"
 )
 

internal/http/template/common.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )

internal/http/template/form.go

@@ -1,6 +1,6 @@
 package template
 
-import libtemplate "github.com/feditools/go-lib/template"
+import libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 
 type FormSelect struct {
 	ID       string

internal/http/template/instance.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/login.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )

internal/http/template/logs.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/template/settings.go

@@ -1,6 +1,6 @@
 package template
 
-import libtemplate "github.com/feditools/go-lib/template"
+import libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 
 // SettingsName is the name of the home template.
 const SettingsName = "settings"

internal/http/template/template.go

@@ -1,7 +1,7 @@
 package template
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/admin_account.go

@@ -1,8 +1,8 @@
 package webapp
 
 import (
-	libhttp "github.com/feditools/go-lib/http"
-	libtemplate "github.com/feditools/go-lib/template"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/path"

internal/http/webapp/admin_block.go

@@ -2,8 +2,8 @@ package webapp
 
 import (
 	"fmt"
-	libhttp "github.com/feditools/go-lib/http"
-	libtemplate "github.com/feditools/go-lib/template"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/path"

internal/http/webapp/admin_block_add.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"git.ptzo.gdn/feditools/relay/internal/util"

internal/http/webapp/admin_block_delete.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"errors"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/admin_block_edit.go

@@ -3,7 +3,7 @@ package webapp
 import (
 	"errors"
 	"fmt"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/admin_block_export.go

@@ -4,7 +4,7 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"net/http"
 	"strings"
 )

internal/http/webapp/admin_block_import.go

@@ -4,8 +4,8 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	libhttp "github.com/feditools/go-lib/http"
-	libtemplate "github.com/feditools/go-lib/template"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"git.ptzo.gdn/feditools/relay/internal/util"

internal/http/webapp/admin_home.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"context"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/admin_instance.go

@@ -1,8 +1,8 @@
 package webapp
 
 import (
-	libhttp "github.com/feditools/go-lib/http"
-	libtemplate "github.com/feditools/go-lib/template"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/path"

internal/http/webapp/admin_instance_view.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"fmt"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/logic"

internal/http/webapp/admin_instance_view_kick.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"net/http"
 )

internal/http/webapp/admin_job.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/scheduler"

internal/http/webapp/admin_job_run_job.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"net/http"
 )

internal/http/webapp/callback.go

@@ -3,7 +3,7 @@ package webapp
 import (
 	"errors"
 	"fmt"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"git.ptzo.gdn/feditools/relay/internal/path"

internal/http/webapp/instance.go

@@ -3,7 +3,7 @@ package webapp
 import (
 	"errors"
 	"fmt"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"

internal/http/webapp/instance_kick.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"net/http"
 )

internal/http/webapp/login.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"errors"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"

internal/http/webapp/logs.go

@@ -1,8 +1,8 @@
 package webapp
 
 import (
-	libhttp "github.com/feditools/go-lib/http"
-	libtemplate "github.com/feditools/go-lib/template"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/path"

internal/http/webapp/middleware.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"context"
-	libhttp "github.com/feditools/go-lib/http"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"net/http"
 )

internal/http/webapp/settings.go

@@ -3,7 +3,7 @@ package webapp
 import (
 	"context"
 	"fmt"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/settings_form.go

@@ -1,7 +1,7 @@
 package webapp
 
 import (
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

internal/http/webapp/template.go

@@ -2,7 +2,7 @@ package webapp
 
 import (
 	"bytes"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/http/template"
 	"git.ptzo.gdn/feditools/relay/internal/language"
 	"git.ptzo.gdn/feditools/relay/internal/models"

internal/http/webapp/webapp.go

@@ -3,7 +3,7 @@ package webapp
 import (
 	"context"
 	"encoding/gob"
-	libtemplate "github.com/feditools/go-lib/template"
+	libtemplate "git.ptzo.gdn/feditools/go-lib/template"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/fedi"

internal/kv/kv.go

@@ -2,7 +2,7 @@ package kv
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"time"
 )
 

internal/logic/logic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"net/http"
 	"net/url"

internal/logic/logic1/activity.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/feditools/go-lib/fedihelper"
-	libhttp "github.com/feditools/go-lib/http"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
+	libhttp "git.ptzo.gdn/feditools/go-lib/http"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 	"git.ptzo.gdn/feditools/relay/internal/path"
 	"github.com/google/uuid"

internal/logic/logic1/actor.go

@@ -2,7 +2,7 @@ package logic1
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/logic"
 )
 

internal/logic/logic1/block_add.go

@@ -3,9 +3,9 @@ package logic1
 import (
 	"context"
 	"errors"
-	worker "github.com/contribsys/faktory_worker_go"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
+	worker "github.com/contribsys/faktory_worker_go"
 	"github.com/sirupsen/logrus"
 )
 

internal/logic/logic1/block_delete.go

@@ -3,9 +3,9 @@ package logic1
 import (
 	"context"
 	"errors"
-	worker "github.com/contribsys/faktory_worker_go"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
+	worker "github.com/contribsys/faktory_worker_go"
 	"github.com/sirupsen/logrus"
 	"time"
 )

internal/logic/logic1/block_update.go

@@ -3,9 +3,9 @@ package logic1
 import (
 	"context"
 	"errors"
-	worker "github.com/contribsys/faktory_worker_go"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/models"
+	worker "github.com/contribsys/faktory_worker_go"
 	"github.com/sirupsen/logrus"
 )
 

internal/logic/logic1/logic.go

@@ -2,7 +2,7 @@ package logic1
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/db"
 	"git.ptzo.gdn/feditools/relay/internal/fedi"

internal/logic/logic1/request.go

@@ -1,7 +1,7 @@
 package logic1
 
 import (
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"github.com/go-fed/httpsig"
 	"go.opentelemetry.io/otel/trace"
 	nethttp "net/http"

internal/logic/logic1/transport.go

@@ -1,6 +1,6 @@
 package logic1
 
-import "github.com/feditools/go-lib/fedihelper"
+import "git.ptzo.gdn/feditools/go-lib/fedihelper"
 
 func (l *Logic) Transport() *fedihelper.Transport {
 	return l.transport

internal/models/account.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"fmt"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"time"
 )
 

internal/models/account_feditools.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"github.com/sirupsen/logrus"
 	"time"
 )

internal/models/instance.go

@@ -6,7 +6,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"encoding/pem"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/util"
 	"github.com/sirupsen/logrus"
 	"io"

internal/models/instance_feditools.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"github.com/sirupsen/logrus"
 	"time"
 )

internal/path/path_webapp.go

@@ -1,6 +1,6 @@
 package path
 
-import libhttp "github.com/feditools/go-lib/http"
+import libhttp "git.ptzo.gdn/feditools/go-lib/http"
 
 const (
 	// public

internal/runner/faktory/activity.go

@@ -3,9 +3,9 @@ package faktory
 import (
 	"context"
 	"fmt"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	faktory "github.com/contribsys/faktory/client"
 	worker "github.com/contribsys/faktory_worker_go"
-	"github.com/feditools/go-lib/fedihelper"
 	"github.com/sirupsen/logrus"
 	"net/url"
 	"strconv"

internal/runner/faktory/middleware.go

@@ -2,8 +2,8 @@ package faktory
 
 import (
 	"context"
-	faktory "github.com/contribsys/faktory/client"
 	"git.ptzo.gdn/feditools/relay/internal/runner"
+	faktory "github.com/contribsys/faktory/client"
 	"go.opentelemetry.io/otel/trace"
 )
 

internal/runner/faktory/notification.go

@@ -3,9 +3,9 @@ package faktory
 import (
 	"context"
 	"fmt"
+	"git.ptzo.gdn/feditools/relay/internal/models"
 	faktory "github.com/contribsys/faktory/client"
 	worker "github.com/contribsys/faktory_worker_go"
-	"git.ptzo.gdn/feditools/relay/internal/models"
 	"github.com/sirupsen/logrus"
 )
 

internal/runner/faktory/runner.go

@@ -2,9 +2,9 @@ package faktory
 
 import (
 	"context"
-	worker "github.com/contribsys/faktory_worker_go"
 	"git.ptzo.gdn/feditools/relay/internal/config"
 	"git.ptzo.gdn/feditools/relay/internal/logic"
+	worker "github.com/contribsys/faktory_worker_go"
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"

internal/runner/runner.go

@@ -2,7 +2,7 @@ package runner
 
 import (
 	"context"
-	"github.com/feditools/go-lib/fedihelper"
+	"git.ptzo.gdn/feditools/go-lib/fedihelper"
 	"git.ptzo.gdn/feditools/relay/internal/models"
 )
 

vendor/git.ptzo.gdn/feditools/go-lib/Makefile

@@ -25,6 +25,6 @@ test: tidy fmt lint
 	go test -cover ./...
 
 tidy:
-	go mod tidy
+	go mod tidy -compat=1.17
 
 .PHONY: check check-fix fmt i18n-extract i18n-merge i18n-translations lint test tidy

vendor/git.ptzo.gdn/feditools/go-lib/fedihelper/actor.go

@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/feditools/go-lib/http"
+	"git.ptzo.gdn/feditools/go-lib/http"
 )
 
 // Actor is an actor response.