go.mod: bump indigo version to fork #1157

+2 -2

appview/issues/issues.go

reviewed

··· 10 10 "time" 11 11 12 12 comatproto "github.com/bluesky-social/indigo/api/atproto" 13 13 - atpclient "github.com/bluesky-social/indigo/atproto/client" 13 13 + "github.com/bluesky-social/indigo/atproto/atclient" 14 14 "github.com/bluesky-social/indigo/atproto/syntax" 15 15 lexutil "github.com/bluesky-social/indigo/lex/util" 16 16 "github.com/go-chi/chi/v5" ··· 1098 1098 // this is used to rollback changes made to the PDS 1099 1099 // 1100 1100 // it is a no-op if the provided ATURI is empty 1101 1101 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 1101 1101 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 1102 1102 if aturi == "" { 1103 1103 return nil 1104 1104 }

+2 -2

appview/labels/labels.go

reviewed

··· 22 22 "tangled.org/core/tid" 23 23 24 24 comatproto "github.com/bluesky-social/indigo/api/atproto" 25 25 - atpclient "github.com/bluesky-social/indigo/atproto/client" 25 25 + "github.com/bluesky-social/indigo/atproto/atclient" 26 26 "github.com/bluesky-social/indigo/atproto/syntax" 27 27 lexutil "github.com/bluesky-social/indigo/lex/util" 28 28 "github.com/go-chi/chi/v5" ··· 269 269 // this is used to rollback changes made to the PDS 270 270 // 271 271 // it is a no-op if the provided ATURI is empty 272 272 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 272 272 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 273 273 if aturi == "" { 274 274 return nil 275 275 }

+3 -3

appview/oauth/oauth.go

reviewed

··· 11 11 "time" 12 12 13 13 comatproto "github.com/bluesky-social/indigo/api/atproto" 14 14 + "github.com/bluesky-social/indigo/atproto/atclient" 15 15 + "github.com/bluesky-social/indigo/atproto/atcrypto" 14 16 "github.com/bluesky-social/indigo/atproto/auth/oauth" 15 15 - atpclient "github.com/bluesky-social/indigo/atproto/client" 16 16 - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" 17 17 "github.com/bluesky-social/indigo/atproto/syntax" 18 18 xrpc "github.com/bluesky-social/indigo/xrpc" 19 19 "github.com/gorilla/sessions" ··· 262 262 return "" 263 263 } 264 264 265 265 - func (o *OAuth) AuthorizedClient(r *http.Request) (*atpclient.APIClient, error) { 265 265 + func (o *OAuth) AuthorizedClient(r *http.Request) (*atclient.APIClient, error) { 266 266 session, err := o.ResumeSession(r) 267 267 if err != nil { 268 268 return nil, fmt.Errorf("error getting session: %w", err)

+2 -2

appview/repo/repo.go

reviewed

··· 32 32 "tangled.org/core/xrpc/serviceauth" 33 33 34 34 comatproto "github.com/bluesky-social/indigo/api/atproto" 35 35 - atpclient "github.com/bluesky-social/indigo/atproto/client" 35 35 + "github.com/bluesky-social/indigo/atproto/atclient" 36 36 "github.com/bluesky-social/indigo/atproto/syntax" 37 37 lexutil "github.com/bluesky-social/indigo/lex/util" 38 38 securejoin "github.com/cyphar/filepath-securejoin" ··· 1204 1204 // this is used to rollback changes made to the PDS 1205 1205 // 1206 1206 // it is a no-op if the provided ATURI is empty 1207 1207 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 1207 1207 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 1208 1208 if aturi == "" { 1209 1209 return nil 1210 1210 }

+2 -2

appview/settings/settings.go

reviewed

··· 28 28 "tangled.org/core/tid" 29 29 30 30 comatproto "github.com/bluesky-social/indigo/api/atproto" 31 31 - atpclient "github.com/bluesky-social/indigo/atproto/client" 31 31 + "github.com/bluesky-social/indigo/atproto/atclient" 32 32 "github.com/bluesky-social/indigo/atproto/syntax" 33 33 lexutil "github.com/bluesky-social/indigo/lex/util" 34 34 "github.com/gliderlabs/ssh" ··· 816 816 817 817 log.Printf("failed to update handle: %s", err) 818 818 msg := err.Error() 819 819 - var apiErr *atpclient.APIError 819 819 + var apiErr *atclient.APIError 820 820 if errors.As(err, &apiErr) && apiErr.Message != "" { 821 821 msg = apiErr.Message 822 822 }

+2 -2

appview/state/state.go

reviewed

··· 38 38 "tangled.org/core/tid" 39 39 40 40 comatproto "github.com/bluesky-social/indigo/api/atproto" 41 41 - atpclient "github.com/bluesky-social/indigo/atproto/client" 41 41 + "github.com/bluesky-social/indigo/atproto/atclient" 42 42 "github.com/bluesky-social/indigo/atproto/syntax" 43 43 lexutil "github.com/bluesky-social/indigo/lex/util" 44 44 "github.com/bluesky-social/indigo/xrpc" ··· 588 588 // this is used to rollback changes made to the PDS 589 589 // 590 590 // it is a no-op if the provided ATURI is empty 591 591 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 591 591 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 592 592 if aturi == "" { 593 593 return nil 594 594 }

+6 -3

go.mod

reviewed

··· 12 12 github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0 13 13 github.com/blevesearch/bleve/v2 v2.5.3 14 14 github.com/bluekeyes/go-gitdiff v0.8.1 15 15 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 16 16 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 15 15 + github.com/bluesky-social/indigo v0.0.0-20260220055544-bf41e2ee75ab 16 16 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654 17 17 github.com/bmatcuk/doublestar/v4 v4.9.1 18 18 github.com/carlmjohnson/versioninfo v0.22.5 19 19 github.com/casbin/casbin/v2 v2.103.0 ··· 45 45 github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c 46 46 github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef 47 47 github.com/stretchr/testify v1.10.0 48 48 - github.com/urfave/cli/v3 v3.3.3 48 48 + github.com/urfave/cli/v3 v3.4.1 49 49 github.com/whyrusleeping/cbor-gen v0.3.1 50 50 github.com/yuin/goldmark v1.7.13 51 51 github.com/yuin/goldmark-emoji v1.0.6 ··· 116 116 github.com/dlclark/regexp2 v1.11.5 // indirect 117 117 github.com/docker/go-connections v0.5.0 // indirect 118 118 github.com/docker/go-units v0.5.0 // indirect 119 119 + github.com/earthboundkid/versioninfo/v2 v2.24.1 // indirect 119 120 github.com/emirpasic/gods v1.18.1 // indirect 120 121 github.com/felixge/httpsnoop v1.0.4 // indirect 121 122 github.com/fsnotify/fsnotify v1.6.0 // indirect ··· 246 247 247 248 replace github.com/alecthomas/chroma/v2 => github.com/oppiliappan/chroma/v2 v2.24.2 248 249 250 250 + replace github.com/bluesky-social/indigo => github.com/boltlessengineer/indigo v0.0.0-20260315101958-fb1dfa36fed2 251 251 + 249 252 // from bluesky-social/indigo 250 253 replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.4

+8 -6

go.sum

reviewed

··· 94 94 github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw= 95 95 github.com/blevesearch/zapx/v16 v16.2.4 h1:tGgfvleXTAkwsD5mEzgM3zCS/7pgocTCnO1oyAUjlww= 96 96 github.com/blevesearch/zapx/v16 v16.2.4/go.mod h1:Rti/REtuuMmzwsI8/C/qIzRaEoSK/wiFYw5e5ctUKKs= 97 97 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e h1:IutKPwmbU0LrYqw03EuwJtMdAe67rDTrL1U8S8dicRU= 98 98 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8= 99 99 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 h1:CFvRtYNSnWRAi/98M3O466t9dYuwtesNbu6FVPymRrA= 100 100 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1/go.mod h1:WiYEeyJSdUwqoaZ71KJSpTblemUCpwJfh5oVXplK6T4= 97 97 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654 h1:OK76FcHhZp8ohjRB0OMWgti0oYAWFlt3KDQcIkH1pfI= 98 98 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654/go.mod h1:vt8kVRKtvrBspt9G38wDD8+BotjIMO8u8IYoVnyE4zY= 101 99 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 102 100 github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 103 101 github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= 104 102 github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 103 103 + github.com/boltlessengineer/indigo v0.0.0-20260315101958-fb1dfa36fed2 h1:63+EsT7kltod8g1eA0eNuvq1q9ANJWRdxlLeJjJDVYY= 104 104 + github.com/boltlessengineer/indigo v0.0.0-20260315101958-fb1dfa36fed2/go.mod h1:VG/LeqLGNI3Ew7lsYixajnZGFfWPv144qbUddh+Oyag= 105 105 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= 106 106 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= 107 107 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= ··· 178 178 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= 179 179 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= 180 180 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= 181 181 + github.com/earthboundkid/versioninfo/v2 v2.24.1 h1:SJTMHaoUx3GzjjnUO1QzP3ZXK6Ee/nbWyCm58eY3oUg= 182 182 + github.com/earthboundkid/versioninfo/v2 v2.24.1/go.mod h1:VcWEooDEuyUJnMfbdTh0uFN4cfEIg+kHMuWB2CDCLjw= 181 183 github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= 182 184 github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= 183 185 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= ··· 535 537 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= 536 538 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= 537 539 github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= 538 538 - github.com/urfave/cli/v3 v3.3.3 h1:byCBaVdIXuLPIDm5CYZRVG6NvT7tv1ECqdU4YzlEa3I= 539 539 - github.com/urfave/cli/v3 v3.3.3/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= 540 540 + github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM= 541 541 + github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= 540 542 github.com/vmihailenco/go-tinylfu v0.2.2 h1:H1eiG6HM36iniK6+21n9LLpzx1G9R3DJa2UjUjbynsI= 541 543 github.com/vmihailenco/go-tinylfu v0.2.2/go.mod h1:CutYi2Q9puTxfcolkliPq4npPuofg9N9t8JVrjzwa3Q= 542 544 github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=

+3 -3

idresolver/resolver.go

reviewed

··· 60 60 base := BaseDirectory(plcUrl) 61 61 cached := identity.NewCacheDirectory(base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5) 62 62 return &Resolver{ 63 63 - directory: &cached, 63 63 + directory: cached, 64 64 } 65 65 } 66 66 ··· 80 80 return nil, err 81 81 } 82 82 83 83 - return r.directory.Lookup(ctx, *id) 83 83 + return r.directory.Lookup(ctx, id) 84 84 } 85 85 86 86 func (r *Resolver) ResolveIdents(ctx context.Context, idents []string) []*identity.Identity { ··· 117 117 return err 118 118 } 119 119 120 120 - return r.directory.Purge(ctx, *id) 120 120 + return r.directory.Purge(ctx, id) 121 121 } 122 122 123 123 func (r *Resolver) Directory() identity.Directory {

+10 -6

nix/gomod2nix.toml

reviewed

··· 139 139 hash = "sha256-GWm5i1ukuBukV0GMF1rffpbOSSXZdfg6/0pABMiGzLQ=" 140 140 replaced = "tangled.sh/oppi.li/go-gitdiff" 141 141 [mod."github.com/bluesky-social/indigo"] 142 142 - version = "v0.0.0-20251003000214-3259b215110e" 143 143 - hash = "sha256-qi/GrquJznbLnnHVpd7IqoryCESbi6xE4X1SiEM2qlo=" 142 142 + version = "v0.0.0-20260315101958-fb1dfa36fed2" 143 143 + hash = "sha256-R5Dmcsi1a5LquA/a30YyjLAh7Mjg17EuTNVCDxyw4JE=" 144 144 + replaced = "github.com/boltlessengineer/indigo" 144 145 [mod."github.com/bluesky-social/jetstream"] 145 145 - version = "v0.0.0-20241210005130-ea96859b93d1" 146 146 - hash = "sha256-AiapbrkjXboIKc5QNiWH0KyNs0zKnn6UlGwWFlkUfm0=" 146 146 + version = "v0.0.0-20260226214936-e0274250f654" 147 147 + hash = "sha256-VE93NvI3PreteLHnlv7WT6GgH2vSjtoFjMygCmrznfg=" 147 148 [mod."github.com/bmatcuk/doublestar/v4"] 148 149 version = "v4.9.1" 149 150 hash = "sha256-0iyHjyTAsfhgYSsE+NKxSNGBuM3Id615VWeQhssTShE=" ··· 225 226 [mod."github.com/dustin/go-humanize"] 226 227 version = "v1.0.1" 227 228 hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc=" 229 229 + [mod."github.com/earthboundkid/versioninfo/v2"] 230 230 + version = "v2.24.1" 231 231 + hash = "sha256-nbRdiX9WN2y1aiw1CR/DQ6AYqztow8FazndwY3kByHM=" 228 232 [mod."github.com/emirpasic/gods"] 229 233 version = "v1.18.1" 230 234 hash = "sha256-hGDKddjLj+5dn2woHtXKUdd49/3xdsqnhx7VEdCu1m4=" ··· 558 562 version = "v1.2.5" 559 563 hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps=" 560 564 [mod."github.com/urfave/cli/v3"] 561 561 - version = "v3.3.3" 562 562 - hash = "sha256-FdPiu7koY1qBinkfca4A05zCrX+Vu4eRz8wlRDZJyGg=" 565 565 + version = "v3.4.1" 566 566 + hash = "sha256-cDMaQrIVMthUhdyI1mKXzDC5/wIK151073lzRl92RnA=" 563 567 [mod."github.com/vmihailenco/go-tinylfu"] 564 568 version = "v0.2.2" 565 569 hash = "sha256-ZHr4g7DJAV6rLcfrEWZwo9wJSeZcXB9KSP38UIOFfaM="