Monorepo for Tangled tangled.org

go.mod: bump indigo version #1103

open opened by boltless.me targeting master from sl/spindle-rewrite

We will start using our own forked version of indigo package.

Signed-off-by: Seongmin Lee git@boltless.me

Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mg2myoqpas22
+38 -29
Diff #0
+2 -2
appview/issues/issues.go
··· 10 10 "time" 11 11 12 12 comatproto "github.com/bluesky-social/indigo/api/atproto" 13 - atpclient "github.com/bluesky-social/indigo/atproto/client" 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" ··· 1099 1099 // this is used to rollback changes made to the PDS 1100 1100 // 1101 1101 // it is a no-op if the provided ATURI is empty 1102 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 1102 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 1103 1103 if aturi == "" { 1104 1104 return nil 1105 1105 }
+2 -2
appview/labels/labels.go
··· 22 22 "tangled.org/core/tid" 23 23 24 24 comatproto "github.com/bluesky-social/indigo/api/atproto" 25 - atpclient "github.com/bluesky-social/indigo/atproto/client" 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 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 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
··· 8 8 "time" 9 9 10 10 comatproto "github.com/bluesky-social/indigo/api/atproto" 11 + "github.com/bluesky-social/indigo/atproto/atclient" 12 + "github.com/bluesky-social/indigo/atproto/atcrypto" 11 13 "github.com/bluesky-social/indigo/atproto/auth/oauth" 12 - atpclient "github.com/bluesky-social/indigo/atproto/client" 13 - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" 14 14 "github.com/bluesky-social/indigo/atproto/syntax" 15 15 xrpc "github.com/bluesky-social/indigo/xrpc" 16 16 "github.com/gorilla/sessions" ··· 256 256 return "" 257 257 } 258 258 259 - func (o *OAuth) AuthorizedClient(r *http.Request) (*atpclient.APIClient, error) { 259 + func (o *OAuth) AuthorizedClient(r *http.Request) (*atclient.APIClient, error) { 260 260 session, err := o.ResumeSession(r) 261 261 if err != nil { 262 262 return nil, fmt.Errorf("error getting session: %w", err)
+2 -2
appview/repo/repo.go
··· 30 30 "tangled.org/core/xrpc/serviceauth" 31 31 32 32 comatproto "github.com/bluesky-social/indigo/api/atproto" 33 - atpclient "github.com/bluesky-social/indigo/atproto/client" 33 + "github.com/bluesky-social/indigo/atproto/atclient" 34 34 "github.com/bluesky-social/indigo/atproto/syntax" 35 35 lexutil "github.com/bluesky-social/indigo/lex/util" 36 36 securejoin "github.com/cyphar/filepath-securejoin" ··· 1198 1198 // this is used to rollback changes made to the PDS 1199 1199 // 1200 1200 // it is a no-op if the provided ATURI is empty 1201 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 1201 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 1202 1202 if aturi == "" { 1203 1203 return nil 1204 1204 }
+2 -2
appview/state/state.go
··· 35 35 "tangled.org/core/tid" 36 36 37 37 comatproto "github.com/bluesky-social/indigo/api/atproto" 38 - atpclient "github.com/bluesky-social/indigo/atproto/client" 38 + "github.com/bluesky-social/indigo/atproto/atclient" 39 39 "github.com/bluesky-social/indigo/atproto/syntax" 40 40 lexutil "github.com/bluesky-social/indigo/lex/util" 41 41 securejoin "github.com/cyphar/filepath-securejoin" ··· 626 626 // this is used to rollback changes made to the PDS 627 627 // 628 628 // it is a no-op if the provided ATURI is empty 629 - func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 629 + func rollbackRecord(ctx context.Context, aturi string, client *atclient.APIClient) error { 630 630 if aturi == "" { 631 631 return nil 632 632 }
+6 -3
go.mod
··· 9 9 github.com/avast/retry-go/v4 v4.6.1 10 10 github.com/blevesearch/bleve/v2 v2.5.3 11 11 github.com/bluekeyes/go-gitdiff v0.8.1 12 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 13 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 12 + github.com/bluesky-social/indigo v0.0.0-20260220055544-bf41e2ee75ab 13 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654 14 14 github.com/bmatcuk/doublestar/v4 v4.9.1 15 15 github.com/carlmjohnson/versioninfo v0.22.5 16 16 github.com/casbin/casbin/v2 v2.103.0 ··· 42 42 github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c 43 43 github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef 44 44 github.com/stretchr/testify v1.10.0 45 - github.com/urfave/cli/v3 v3.3.3 45 + github.com/urfave/cli/v3 v3.4.1 46 46 github.com/whyrusleeping/cbor-gen v0.3.1 47 47 github.com/yuin/goldmark v1.7.13 48 48 github.com/yuin/goldmark-emoji v1.0.6 ··· 101 101 github.com/dlclark/regexp2 v1.11.5 // indirect 102 102 github.com/docker/go-connections v0.5.0 // indirect 103 103 github.com/docker/go-units v0.5.0 // indirect 104 + github.com/earthboundkid/versioninfo/v2 v2.24.1 // indirect 104 105 github.com/emirpasic/gods v1.18.1 // indirect 105 106 github.com/felixge/httpsnoop v1.0.4 // indirect 106 107 github.com/fsnotify/fsnotify v1.6.0 // indirect ··· 226 227 227 228 replace github.com/alecthomas/chroma/v2 => github.com/oppiliappan/chroma/v2 v2.24.2 228 229 230 + replace github.com/bluesky-social/indigo => github.com/boltlessengineer/indigo v0.0.0-20260302045703-861eeb80e873 231 + 229 232 // from bluesky-social/indigo 230 233 replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.4
+8 -6
go.sum
··· 67 67 github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw= 68 68 github.com/blevesearch/zapx/v16 v16.2.4 h1:tGgfvleXTAkwsD5mEzgM3zCS/7pgocTCnO1oyAUjlww= 69 69 github.com/blevesearch/zapx/v16 v16.2.4/go.mod h1:Rti/REtuuMmzwsI8/C/qIzRaEoSK/wiFYw5e5ctUKKs= 70 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e h1:IutKPwmbU0LrYqw03EuwJtMdAe67rDTrL1U8S8dicRU= 71 - github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8= 72 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 h1:CFvRtYNSnWRAi/98M3O466t9dYuwtesNbu6FVPymRrA= 73 - github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1/go.mod h1:WiYEeyJSdUwqoaZ71KJSpTblemUCpwJfh5oVXplK6T4= 70 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654 h1:OK76FcHhZp8ohjRB0OMWgti0oYAWFlt3KDQcIkH1pfI= 71 + github.com/bluesky-social/jetstream v0.0.0-20260226214936-e0274250f654/go.mod h1:vt8kVRKtvrBspt9G38wDD8+BotjIMO8u8IYoVnyE4zY= 74 72 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 75 73 github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 76 74 github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= 77 75 github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 76 + github.com/boltlessengineer/indigo v0.0.0-20260302045703-861eeb80e873 h1:dMpEw+TYJMQYAQI+jWw/34+kNqPaOxMR9wxnzuSrJIQ= 77 + github.com/boltlessengineer/indigo v0.0.0-20260302045703-861eeb80e873/go.mod h1:VG/LeqLGNI3Ew7lsYixajnZGFfWPv144qbUddh+Oyag= 78 78 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= 79 79 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= 80 80 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= ··· 145 145 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= 146 146 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= 147 147 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= 148 + github.com/earthboundkid/versioninfo/v2 v2.24.1 h1:SJTMHaoUx3GzjjnUO1QzP3ZXK6Ee/nbWyCm58eY3oUg= 149 + github.com/earthboundkid/versioninfo/v2 v2.24.1/go.mod h1:VcWEooDEuyUJnMfbdTh0uFN4cfEIg+kHMuWB2CDCLjw= 148 150 github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= 149 151 github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= 150 152 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= ··· 483 485 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= 484 486 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 485 487 github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= 486 - github.com/urfave/cli/v3 v3.3.3 h1:byCBaVdIXuLPIDm5CYZRVG6NvT7tv1ECqdU4YzlEa3I= 487 - github.com/urfave/cli/v3 v3.3.3/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= 488 + github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM= 489 + github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= 488 490 github.com/vmihailenco/go-tinylfu v0.2.2 h1:H1eiG6HM36iniK6+21n9LLpzx1G9R3DJa2UjUjbynsI= 489 491 github.com/vmihailenco/go-tinylfu v0.2.2/go.mod h1:CutYi2Q9puTxfcolkliPq4npPuofg9N9t8JVrjzwa3Q= 490 492 github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+3 -3
idresolver/resolver.go
··· 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 - directory: &cached, 63 + directory: cached, 64 64 } 65 65 } 66 66 ··· 80 80 return nil, err 81 81 } 82 82 83 - return r.directory.Lookup(ctx, *id) 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 - return r.directory.Purge(ctx, *id) 120 + return r.directory.Purge(ctx, id) 121 121 } 122 122 123 123 func (r *Resolver) Directory() identity.Directory {
+10 -6
nix/gomod2nix.toml
··· 103 103 hash = "sha256-GWm5i1ukuBukV0GMF1rffpbOSSXZdfg6/0pABMiGzLQ=" 104 104 replaced = "tangled.sh/oppi.li/go-gitdiff" 105 105 [mod."github.com/bluesky-social/indigo"] 106 - version = "v0.0.0-20251003000214-3259b215110e" 107 - hash = "sha256-qi/GrquJznbLnnHVpd7IqoryCESbi6xE4X1SiEM2qlo=" 106 + version = "v0.0.0-20260302045703-861eeb80e873" 107 + hash = "sha256-WSsFGuNzYFqkU376uInDwQnTqR1lBWFHmzKig6bKZj8=" 108 + replaced = "github.com/boltlessengineer/indigo" 108 109 [mod."github.com/bluesky-social/jetstream"] 109 - version = "v0.0.0-20241210005130-ea96859b93d1" 110 - hash = "sha256-AiapbrkjXboIKc5QNiWH0KyNs0zKnn6UlGwWFlkUfm0=" 110 + version = "v0.0.0-20260226214936-e0274250f654" 111 + hash = "sha256-VE93NvI3PreteLHnlv7WT6GgH2vSjtoFjMygCmrznfg=" 111 112 [mod."github.com/bmatcuk/doublestar/v4"] 112 113 version = "v4.9.1" 113 114 hash = "sha256-0iyHjyTAsfhgYSsE+NKxSNGBuM3Id615VWeQhssTShE=" ··· 189 190 [mod."github.com/dustin/go-humanize"] 190 191 version = "v1.0.1" 191 192 hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc=" 193 + [mod."github.com/earthboundkid/versioninfo/v2"] 194 + version = "v2.24.1" 195 + hash = "sha256-nbRdiX9WN2y1aiw1CR/DQ6AYqztow8FazndwY3kByHM=" 192 196 [mod."github.com/emirpasic/gods"] 193 197 version = "v1.18.1" 194 198 hash = "sha256-hGDKddjLj+5dn2woHtXKUdd49/3xdsqnhx7VEdCu1m4=" ··· 510 514 version = "v1.10.0" 511 515 hash = "sha256-fJ4gnPr0vnrOhjQYQwJ3ARDKPsOtA7d4olQmQWR+wpI=" 512 516 [mod."github.com/urfave/cli/v3"] 513 - version = "v3.3.3" 514 - hash = "sha256-FdPiu7koY1qBinkfca4A05zCrX+Vu4eRz8wlRDZJyGg=" 517 + version = "v3.4.1" 518 + hash = "sha256-cDMaQrIVMthUhdyI1mKXzDC5/wIK151073lzRl92RnA=" 515 519 [mod."github.com/vmihailenco/go-tinylfu"] 516 520 version = "v0.2.2" 517 521 hash = "sha256-ZHr4g7DJAV6rLcfrEWZwo9wJSeZcXB9KSP38UIOFfaM="

History

1 round 0 comments
sign up or login to add to the discussion
boltless.me submitted #0
1 commit
expand
go.mod: bump indigo version
3/3 success
expand
merge conflicts detected
expand
  • appview/state/state.go:35
  • go.mod:9
  • go.sum:483
expand 0 comments