From c8583e1749c9eadaec5d5b961fbfef7ca7ce9cda Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Sat, 22 Nov 2025 16:18:51 -0800 Subject: [PATCH] chore: bump indigo, make use of new package names --- go.mod | 5 ++--- go.sum | 6 ++++-- pkg/api/stream_key.go | 2 +- pkg/atproto/labeler_firehose.go | 4 ++-- pkg/atproto/lexicon_repo.go | 12 ++++++------ pkg/atproto/sync.go | 4 ++-- pkg/atproto/util.go | 2 +- pkg/crypto/signers/signers.go | 2 +- pkg/crypto/spkey/spkey.go | 2 +- pkg/media/validate.go | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index a1b974d9..9674531e 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,6 @@ replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.4 replace github.com/AxisCommunications/go-dpop => github.com/streamplace/go-dpop v0.0.0-20250510031900-c897158a8ad4 -replace github.com/bluesky-social/indigo => github.com/streamplace/indigo v0.0.0-20250813192504-b19ccd82854b - require ( firebase.google.com/go/v4 v4.14.1 github.com/99designs/gqlgen v0.17.64 @@ -17,7 +15,7 @@ require ( github.com/NYTimes/gziphandler v1.1.1 github.com/ThalesGroup/crypto11 v0.0.0-00010101000000-000000000000 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d - github.com/bluesky-social/indigo v0.0.0-20250729223159-573ae927246a + github.com/bluesky-social/indigo v0.0.0-20251114034233-c10ddb5cf518 github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v5 v5.0.2 github.com/decred/dcrd/dcrec/secp256k1 v1.0.4 @@ -199,6 +197,7 @@ require ( github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect + github.com/earthboundkid/versioninfo/v2 v2.24.1 // indirect github.com/emicklei/dot v1.9.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/ethereum/c-kzg-4844/v2 v2.1.1 // indirect diff --git a/go.sum b/go.sum index 16865096..fab02d9f 100644 --- a/go.sum +++ b/go.sum @@ -213,6 +213,8 @@ github.com/bluenviron/gortsplib/v4 v4.12.3 h1:3EzbyGb5+MIOJQYiWytRegFEP4EW5paiyT github.com/bluenviron/gortsplib/v4 v4.12.3/go.mod h1:SkZPdaMNr+IvHt2PKRjUXxZN6FDutmSZn4eT0GmF0sk= github.com/bluenviron/mediacommon/v2 v2.4.0 h1:Ss1T7AMxTrICJ+a/N5urS/1lp1ZpsF+3iJq3B/RLDMw= github.com/bluenviron/mediacommon/v2 v2.4.0/go.mod h1:a6MbPmXtYda9mKibKVMZlW20GYLLrX2R7ZkUE+1pwV0= +github.com/bluesky-social/indigo v0.0.0-20251114034233-c10ddb5cf518 h1:XSbejNxWMcXMg29Fww7DT9Z4q+W+tWmvoWej332MVks= +github.com/bluesky-social/indigo v0.0.0-20251114034233-c10ddb5cf518/go.mod h1:GuGAU33qKulpZCZNPcUeIQ4RW6KzNvOy7s8MSUXbAng= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -355,6 +357,8 @@ github.com/dunglas/httpsfv v1.0.2 h1:iERDp/YAfnojSDJ7PW3dj1AReJz4MrwbECSSE59JWL0 github.com/dunglas/httpsfv v1.0.2/go.mod h1:zID2mqw9mFsnt7YC3vYQ9/cjq30q41W+1AnDwH8TiMg= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/earthboundkid/versioninfo/v2 v2.24.1 h1:SJTMHaoUx3GzjjnUO1QzP3ZXK6Ee/nbWyCm58eY3oUg= +github.com/earthboundkid/versioninfo/v2 v2.24.1/go.mod h1:VcWEooDEuyUJnMfbdTh0uFN4cfEIg+kHMuWB2CDCLjw= github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emicklei/dot v1.9.0 h1:FyaJNctdMfaEIbTQ1FkKZ1UCZyJJSkyvkrXOVoNZPKU= @@ -1303,8 +1307,6 @@ github.com/streamplace/atproto-oauth-golang v0.0.0-20250619231223-a9c04fb888ac h github.com/streamplace/atproto-oauth-golang v0.0.0-20250619231223-a9c04fb888ac/go.mod h1:9LlKkqciiO5lRfbX0n4Wn5KNY9nvFb4R3by8FdW2TWc= github.com/streamplace/go-dpop v0.0.0-20250510031900-c897158a8ad4 h1:L1fS4HJSaAyNnkwfuZubgfeZy8rkWmA0cMtH5Z0HqNc= github.com/streamplace/go-dpop v0.0.0-20250510031900-c897158a8ad4/go.mod h1:bGUXY9Wd4mnd+XUrOYZr358J2f6z9QO/dLhL1SsiD+0= -github.com/streamplace/indigo v0.0.0-20250813192504-b19ccd82854b h1:vh0Z1bDgcVXQjgmcXOBkC3B4uWi+HaxeyTvETzcA/Vg= -github.com/streamplace/indigo v0.0.0-20250813192504-b19ccd82854b/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8= github.com/streamplace/oatproxy v0.0.0-20251022224044-56ff4e867807 h1:9GXp2QxTVxsK7QLRnjDV9qxdTziLuTVhGMoVicHQ18U= github.com/streamplace/oatproxy v0.0.0-20251022224044-56ff4e867807/go.mod h1:pXi24hA7xBHj8eEywX6wGqJOR9FaEYlGwQ/72rN6okw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/pkg/api/stream_key.go b/pkg/api/stream_key.go index 455a29af..b686a73e 100644 --- a/pkg/api/stream_key.go +++ b/pkg/api/stream_key.go @@ -5,7 +5,7 @@ import ( "crypto" "fmt" - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/decred/dcrd/dcrec/secp256k1" "github.com/mr-tron/base58" "stream.place/streamplace/pkg/atproto" diff --git a/pkg/atproto/labeler_firehose.go b/pkg/atproto/labeler_firehose.go index 8a19ce7c..fa4778cc 100644 --- a/pkg/atproto/labeler_firehose.go +++ b/pkg/atproto/labeler_firehose.go @@ -9,7 +9,7 @@ import ( "time" comatproto "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/atproto/label" + "github.com/bluesky-social/indigo/atproto/labeling" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/parallel" @@ -115,7 +115,7 @@ func (atsync *ATProtoSynchronizer) StartLabelerFirehoseRetry(ctx context.Context log.Error(ctx, "failed to update labeler cursor", "err", err) } for _, labelLex := range evt.Labels { - l := label.FromLexicon(labelLex) + l := labeling.FromLexicon(labelLex) err = l.VerifySignature(pub) if err != nil { log.Error(ctx, "failed to verify label signature", "err", err) diff --git a/pkg/atproto/lexicon_repo.go b/pkg/atproto/lexicon_repo.go index 679a1a7a..ebe90947 100644 --- a/pkg/atproto/lexicon_repo.go +++ b/pkg/atproto/lexicon_repo.go @@ -12,8 +12,8 @@ import ( "time" comatproto "github.com/bluesky-social/indigo/api/atproto" - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atcrypto" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/lexicon" "github.com/bluesky-social/indigo/carstore" lexutil "github.com/bluesky-social/indigo/lex/util" @@ -73,12 +73,12 @@ func (sfw *SchemaFileWrapper) MarshalCBOR(w io.Writer) error { if err != nil { return err } - mapObj, err := data.UnmarshalJSON(bs) + mapObj, err := atdata.UnmarshalJSON(bs) if err != nil { return err } mapObj["$type"] = "com.atproto.lexicon.schema" - cbs, err := data.MarshalCBOR(mapObj) + cbs, err := atdata.MarshalCBOR(mapObj) if err != nil { return err } @@ -94,7 +94,7 @@ func (sfw *SchemaFileWrapper) MarshalJSON() ([]byte, error) { if err != nil { return nil, err } - mapObj, err := data.UnmarshalJSON(bs) + mapObj, err := atdata.UnmarshalJSON(bs) if err != nil { return nil, err } @@ -345,7 +345,7 @@ func GetRecordCBOR(ctx context.Context, ses *carstore.DeltaSession, c cid.Cid, c } var val cbg.CBORMarshaler if collection == "com.atproto.lexicon.schema" { - sfMap, err := data.UnmarshalCBOR(b.RawData()) + sfMap, err := atdata.UnmarshalCBOR(b.RawData()) if err != nil { return nil, fmt.Errorf("failed to unmarshal schema file: %w", err) } diff --git a/pkg/atproto/sync.go b/pkg/atproto/sync.go index abaa998f..3c5cd5d5 100644 --- a/pkg/atproto/sync.go +++ b/pkg/atproto/sync.go @@ -8,7 +8,7 @@ import ( "time" "github.com/bluesky-social/indigo/api/bsky" - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/syntax" "stream.place/streamplace/pkg/aqtime" "stream.place/streamplace/pkg/log" @@ -31,7 +31,7 @@ func (atsync *ATProtoSynchronizer) handleCreateUpdate(ctx context.Context, userD if err != nil { return fmt.Errorf("failed to parse ATURI: %w", err) } - d, err := data.UnmarshalCBOR(*recCBOR) + d, err := atdata.UnmarshalCBOR(*recCBOR) if err != nil { return fmt.Errorf("failed to unmarhsal record CBOR: %w", err) } diff --git a/pkg/atproto/util.go b/pkg/atproto/util.go index 19b1c659..42bbb2da 100644 --- a/pkg/atproto/util.go +++ b/pkg/atproto/util.go @@ -6,7 +6,7 @@ import ( "crypto/elliptic" "fmt" - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" ethcrypto "github.com/ethereum/go-ethereum/crypto" ) diff --git a/pkg/crypto/signers/signers.go b/pkg/crypto/signers/signers.go index 653438c1..86864fc7 100644 --- a/pkg/crypto/signers/signers.go +++ b/pkg/crypto/signers/signers.go @@ -14,7 +14,7 @@ import ( "math/big" "time" - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/pkg/crypto/spkey/spkey.go b/pkg/crypto/spkey/spkey.go index f23ae311..fa68f7fe 100644 --- a/pkg/crypto/spkey/spkey.go +++ b/pkg/crypto/spkey/spkey.go @@ -4,7 +4,7 @@ import ( "crypto" "fmt" - atcrypto "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/decred/dcrd/dcrec/secp256k1" "github.com/mr-tron/base58" ) diff --git a/pkg/media/validate.go b/pkg/media/validate.go index 6d7600e8..5280580a 100644 --- a/pkg/media/validate.go +++ b/pkg/media/validate.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "go.opentelemetry.io/otel" "stream.place/streamplace/pkg/aqio" "stream.place/streamplace/pkg/aqtime" @@ -201,7 +201,7 @@ func (mm *MediaManager) isWarningBlocked(warning string) bool { } type ValidationResult struct { - Pub *crypto.PublicKeyK256 + Pub *atcrypto.PublicKeyK256 Meta *SegmentMetadata MediaData *model.SegmentMediaData Manifest *c2patypes.Manifest -- 2.51.2