From 732e95ddb6df5ce7da54987f97c51a1620c9a7c8 Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Fri, 10 Jul 2026 15:24:39 -0700 Subject: [PATCH] make fix --- go.sum | 14 -------------- pkg/api/api.go | 8 ++++---- pkg/api/vod_transfer.go | 2 +- pkg/api/websocket.go | 4 ++-- pkg/atproto/atproto.go | 2 +- pkg/atproto/badges_test.go | 2 +- pkg/atproto/chat_message_test.go | 6 +++--- pkg/atproto/firehose.go | 4 ++-- pkg/atproto/firehose_moq_test.go | 4 ++-- pkg/atproto/firehose_multirelay_test.go | 6 +++--- pkg/atproto/handle_test.go | 6 +++--- pkg/atproto/lexicon_repo.go | 4 ++-- pkg/atproto/lexicon_repo_queries.go | 2 +- pkg/atproto/moderation_test.go | 8 ++++---- pkg/atproto/profile.go | 2 +- pkg/atproto/server_repo.go | 4 ++-- pkg/atproto/server_repo_test.go | 2 +- pkg/atproto/sync.go | 4 ++-- pkg/cmd/streamplace.go | 2 +- pkg/config/config.go | 2 +- pkg/director/stream_session.go | 8 ++++---- pkg/integrations/discord/avatars.go | 2 +- pkg/linking/linking.go | 2 +- pkg/linking/linking_test.go | 4 ++-- pkg/livepeer/livepeer.go | 2 +- pkg/media/key_revocation.go | 2 +- pkg/model/beta_invite.go | 2 +- pkg/model/beta_request.go | 2 +- pkg/model/block.go | 2 +- pkg/model/broadcast_origin.go | 4 ++-- pkg/model/bsky_profile.go | 2 +- pkg/model/chat_message.go | 4 ++-- pkg/model/feed_post.go | 2 +- pkg/model/label.go | 2 +- pkg/model/like.go | 2 +- pkg/model/livestream.go | 2 +- pkg/model/media_origin.go | 2 +- pkg/model/media_track.go | 2 +- pkg/model/media_view_count.go | 2 +- pkg/model/media_view_count_test.go | 2 +- pkg/model/model.go | 4 ++-- pkg/model/moderation_delegation.go | 4 ++-- pkg/model/video.go | 4 ++-- pkg/model/video_list.go | 4 ++-- pkg/model/video_list_test.go | 2 +- pkg/model/vod_comment.go | 4 ++-- pkg/moderation/permissions_test.go | 2 +- pkg/multitest/multitest_test.go | 2 +- pkg/replication/iroh_replicator/kv.go | 2 +- pkg/spxrpc/app_bsky_actor.go | 2 +- pkg/spxrpc/app_bsky_feed.go | 2 +- pkg/spxrpc/com_atproto_repo.go | 2 +- pkg/spxrpc/labels_test.go | 2 +- pkg/spxrpc/place_stream_live.go | 6 +++--- .../place_stream_media_finalizelivestream.go | 2 +- pkg/spxrpc/place_stream_moderation.go | 8 ++++---- pkg/spxrpc/place_stream_playback_getvideo.go | 2 +- pkg/spxrpc/place_stream_playback_getvideo_test.go | 4 ++-- pkg/spxrpc/place_stream_vod_drafts.go | 4 ++-- pkg/spxrpc/storage.go | 2 +- pkg/spxrpc/webhook.go | 2 +- pkg/statedb/draft_video.go | 4 ++-- pkg/statedb/multistream_target.go | 4 ++-- pkg/statedb/queue_processor.go | 4 ++-- pkg/statedb/xrpc_stream_event.go | 4 ++-- pkg/upload/upload.go | 2 +- pkg/vod/publish.go | 6 +++--- pkg/vod/publish_draft.go | 6 +++--- pkg/vod/publish_draft_test.go | 2 +- pkg/vod/publish_video.go | 6 +++--- 70 files changed, 115 insertions(+), 129 deletions(-) diff --git a/go.sum b/go.sum index 5529ea6cf..a20f7887f 100644 --- a/go.sum +++ b/go.sum @@ -1374,20 +1374,6 @@ github.com/streamplace/atproto-oauth-golang v0.0.0-20260413212710-98956064d06c h github.com/streamplace/atproto-oauth-golang v0.0.0-20260413212710-98956064d06c/go.mod h1:9LlKkqciiO5lRfbX0n4Wn5KNY9nvFb4R3by8FdW2TWc= github.com/streamplace/atproto-oauth-golang v0.0.0-20250619231223-a9c04fb888ac h1:heVM4CGox3kfJclSmagsI3hvKk7W52EegnFqqs9CSYk= github.com/streamplace/atproto-oauth-golang v0.0.0-20250619231223-a9c04fb888ac/go.mod h1:9LlKkqciiO5lRfbX0n4Wn5KNY9nvFb4R3by8FdW2TWc= -github.com/streamplace/glex v0.0.0-20260709192106-b16a1b201ee4 h1:6SVXLgRwRX3nFQi+h8cyud8s98GeRoJ8jBVtm3Sxucc= -github.com/streamplace/glex v0.0.0-20260709192106-b16a1b201ee4/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260709212141-f72cc880edd8 h1:4WqGNFWzf2VaX2AAh7GelDUh+7Ww/sZtYRMufh815xs= -github.com/streamplace/glex v0.0.0-20260709212141-f72cc880edd8/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260709212339-df843c76e0fa h1:10l5UzKkQJdyjBRPGvgny2VbBxWkAC+tu/Gx13iCOJ8= -github.com/streamplace/glex v0.0.0-20260709212339-df843c76e0fa/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260709223720-e8ea93478153 h1:SzYHxb4ZziDwm1jNp72CIMZJdcH5ZppP90Q7LSbjc38= -github.com/streamplace/glex v0.0.0-20260709223720-e8ea93478153/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260709223900-8042d1d98012 h1:6CMW4uG46re65acd3SRPyEdlHAZ1jfVZZInBuaPmFpI= -github.com/streamplace/glex v0.0.0-20260709223900-8042d1d98012/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260710212912-7eead2a5e32f h1:XNjRP13SAZHvOO2Gt3B2yhT5PHVi6HIuRRaYCwPiDbs= -github.com/streamplace/glex v0.0.0-20260710212912-7eead2a5e32f/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= -github.com/streamplace/glex v0.0.0-20260710214434-29f2903d987f h1:j1+u8vwbjXgzn8Y0UTgC6Tft50G4H8NglZvcUt7Bspw= -github.com/streamplace/glex v0.0.0-20260710214434-29f2903d987f/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= github.com/streamplace/glex v0.0.0-20260710214555-331335123ed9 h1:mf+7iVPnlVBMlsPeRWCG0c4gREd6qOvSeg42dEMF/OE= github.com/streamplace/glex v0.0.0-20260710214555-331335123ed9/go.mod h1:33czt2ilG9oouO8fq1GzfwMr4QE278Of3ptNx6/28mw= github.com/streamplace/go-dpop v0.0.0-20250510031900-c897158a8ad4 h1:L1fS4HJSaAyNnkwfuZubgfeZy8rkWmA0cMtH5Z0HqNc= diff --git a/pkg/api/api.go b/pkg/api/api.go index c83729614..c33115f19 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -19,13 +19,13 @@ import ( "time" "github.com/NYTimes/gziphandler" - "stream.place/streamplace/pkg/appbsky" "github.com/google/uuid" "github.com/julienschmidt/httprouter" "github.com/labstack/echo/v4" "github.com/rs/cors" sloghttp "github.com/samber/slog-http" "golang.org/x/time/rate" + "stream.place/streamplace/pkg/appbsky" "github.com/streamplace/oatproxy/pkg/oatproxy" "stream.place/streamplace/js/app" @@ -43,9 +43,9 @@ import ( "stream.place/streamplace/pkg/mist/mistconfig" "stream.place/streamplace/pkg/model" "stream.place/streamplace/pkg/notifications" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/spxrpc" "stream.place/streamplace/pkg/statedb" - "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/upload" "stream.place/streamplace/pkg/viewlog" @@ -679,8 +679,8 @@ func (a *StreamplaceAPI) HandleBlueskyResolve(ctx context.Context) httprouter.Ha type ChatResponse struct { Post *appbsky.FeedPost `json:"post"` - Repo *model.Repo `json:"repo"` - CID string `json:"cid"` + Repo *model.Repo `json:"repo"` + CID string `json:"cid"` } func (a *StreamplaceAPI) HandleChat(ctx context.Context) httprouter.Handle { diff --git a/pkg/api/vod_transfer.go b/pkg/api/vod_transfer.go index ca4bed481..48acb9f45 100644 --- a/pkg/api/vod_transfer.go +++ b/pkg/api/vod_transfer.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/julienschmidt/httprouter" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/errors" diff --git a/pkg/api/websocket.go b/pkg/api/websocket.go index c09a7b995..a49b237f7 100644 --- a/pkg/api/websocket.go +++ b/pkg/api/websocket.go @@ -8,17 +8,17 @@ import ( "net/http" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/google/uuid" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/atproto" apierrors "stream.place/streamplace/pkg/errors" "stream.place/streamplace/pkg/log" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/renditions" "stream.place/streamplace/pkg/spmetrics" - "stream.place/streamplace/pkg/placestream" ) // todo: does this mean a whole message has to fit within the buffer? diff --git a/pkg/atproto/atproto.go b/pkg/atproto/atproto.go index 249de06cc..f5ac04e15 100644 --- a/pkg/atproto/atproto.go +++ b/pkg/atproto/atproto.go @@ -9,7 +9,6 @@ import ( "github.com/patrickmn/go-cache" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/repo" @@ -17,6 +16,7 @@ import ( "github.com/ipfs/go-cid" "go.opentelemetry.io/otel" "stream.place/streamplace/pkg/aqhttp" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/model" ) diff --git a/pkg/atproto/badges_test.go b/pkg/atproto/badges_test.go index ccd16fbe6..0805d8191 100644 --- a/pkg/atproto/badges_test.go +++ b/pkg/atproto/badges_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - bsky "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/util" "github.com/stretchr/testify/require" + bsky "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/model" "stream.place/streamplace/pkg/placestream" diff --git a/pkg/atproto/chat_message_test.go b/pkg/atproto/chat_message_test.go index f82b21336..381461076 100644 --- a/pkg/atproto/chat_message_test.go +++ b/pkg/atproto/chat_message_test.go @@ -8,17 +8,17 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" "github.com/cenkalti/backoff" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/devenv" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func TestChatMessage(t *testing.T) { diff --git a/pkg/atproto/firehose.go b/pkg/atproto/firehose.go index afd01c28c..6aac44478 100644 --- a/pkg/atproto/firehose.go +++ b/pkg/atproto/firehose.go @@ -13,14 +13,14 @@ import ( "time" indigoatproto "github.com/bluesky-social/indigo/api/atproto" - "github.com/ipfs/go-cid" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/parallel" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/repomgr" + "github.com/ipfs/go-cid" + glexrt "github.com/streamplace/glex/runtime" "github.com/streamplace/oatproxy/pkg/oatproxy" "golang.org/x/sync/errgroup" "stream.place/streamplace/pkg/aqhttp" diff --git a/pkg/atproto/firehose_moq_test.go b/pkg/atproto/firehose_moq_test.go index 5d21ae06a..0a90afcdc 100644 --- a/pkg/atproto/firehose_moq_test.go +++ b/pkg/atproto/firehose_moq_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/parallel" - glexrt "github.com/streamplace/glex/runtime" "github.com/ipfs/go-cid" atmoq "github.com/streamplace/atmoq-go" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/model" ) diff --git a/pkg/atproto/firehose_multirelay_test.go b/pkg/atproto/firehose_multirelay_test.go index 4465300c7..8a3239b89 100644 --- a/pkg/atproto/firehose_multirelay_test.go +++ b/pkg/atproto/firehose_multirelay_test.go @@ -7,17 +7,17 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" "github.com/prometheus/client_golang/prometheus" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/devenv" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // TestMultiRelayDedup subscribes to the same dev PDS firehose twice (via two diff --git a/pkg/atproto/handle_test.go b/pkg/atproto/handle_test.go index dda8e542c..3c03c03b4 100644 --- a/pkg/atproto/handle_test.go +++ b/pkg/atproto/handle_test.go @@ -7,17 +7,17 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/devenv" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func TestHandleChange(t *testing.T) { diff --git a/pkg/atproto/lexicon_repo.go b/pkg/atproto/lexicon_repo.go index f4e02d186..357eea105 100644 --- a/pkg/atproto/lexicon_repo.go +++ b/pkg/atproto/lexicon_repo.go @@ -11,18 +11,18 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/comatproto" "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" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/models" "github.com/bluesky-social/indigo/mst" atrepo "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/util" "github.com/ipfs/go-cid" + glexrt "github.com/streamplace/glex/runtime" cbg "github.com/whyrusleeping/cbor-gen" + "stream.place/streamplace/pkg/comatproto" "github.com/whyrusleeping/go-did" "stream.place/streamplace/lexicons" diff --git a/pkg/atproto/lexicon_repo_queries.go b/pkg/atproto/lexicon_repo_queries.go index d03f3e6fd..de295d7d7 100644 --- a/pkg/atproto/lexicon_repo_queries.go +++ b/pkg/atproto/lexicon_repo_queries.go @@ -7,12 +7,12 @@ import ( "sync" "github.com/bluesky-social/indigo/carstore" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/util" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/ipld/go-car" + glexrt "github.com/streamplace/glex/runtime" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/comatproto" diff --git a/pkg/atproto/moderation_test.go b/pkg/atproto/moderation_test.go index d6f241f49..38d3c9d15 100644 --- a/pkg/atproto/moderation_test.go +++ b/pkg/atproto/moderation_test.go @@ -7,19 +7,19 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/devenv" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func TestDelegatedModeration(t *testing.T) { diff --git a/pkg/atproto/profile.go b/pkg/atproto/profile.go index 969b7ab7f..8feac4da3 100644 --- a/pkg/atproto/profile.go +++ b/pkg/atproto/profile.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/xrpc" + "stream.place/streamplace/pkg/appbsky" ) var ErrUserNotFound = errors.New("user not found") diff --git a/pkg/atproto/server_repo.go b/pkg/atproto/server_repo.go index 2604f2047..362a961cd 100644 --- a/pkg/atproto/server_repo.go +++ b/pkg/atproto/server_repo.go @@ -12,19 +12,19 @@ import ( "sync" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/bluesky-social/indigo/carstore" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/models" atrepo "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/util" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" "github.com/ipld/go-car" + glexrt "github.com/streamplace/glex/runtime" cbg "github.com/whyrusleeping/cbor-gen" "gorm.io/driver/sqlite" "gorm.io/gorm" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/crypto/spkey" diff --git a/pkg/atproto/server_repo_test.go b/pkg/atproto/server_repo_test.go index 89137403b..10adbb208 100644 --- a/pkg/atproto/server_repo_test.go +++ b/pkg/atproto/server_repo_test.go @@ -9,8 +9,8 @@ import ( "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func TestServerRepo(t *testing.T) { diff --git a/pkg/atproto/sync.go b/pkg/atproto/sync.go index 1eb25c989..984a4f735 100644 --- a/pkg/atproto/sync.go +++ b/pkg/atproto/sync.go @@ -9,17 +9,17 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/util" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqtime" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/model" notificationpkg "stream.place/streamplace/pkg/notifications" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" glexrt "github.com/streamplace/glex/runtime" ) diff --git a/pkg/cmd/streamplace.go b/pkg/cmd/streamplace.go index 3af835881..c5b4984ad 100644 --- a/pkg/cmd/streamplace.go +++ b/pkg/cmd/streamplace.go @@ -20,7 +20,6 @@ import ( "syscall" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/carstore" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/livepeer/go-livepeer/cmd/livepeer/starter" @@ -30,6 +29,7 @@ import ( "stream.place/streamplace/pkg/atproto" "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/director" "stream.place/streamplace/pkg/gstinit" "stream.place/streamplace/pkg/ingestframe" diff --git a/pkg/config/config.go b/pkg/config/config.go index ff65e128a..1ba3931b4 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -32,8 +32,8 @@ import ( "stream.place/streamplace/pkg/integrations/discord/discordtypes" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/moderation" - "stream.place/streamplace/pkg/s3" placestream "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/s3" ) const SPDataDir = "$SP_DATA_DIR" diff --git a/pkg/director/stream_session.go b/pkg/director/stream_session.go index b23524bb0..8b0065fb7 100644 --- a/pkg/director/stream_session.go +++ b/pkg/director/stream_session.go @@ -10,19 +10,19 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" "github.com/bluesky-social/indigo/xrpc" "github.com/google/uuid" + glexrt "github.com/streamplace/glex/runtime" "github.com/streamplace/oatproxy/pkg/oatproxy" "golang.org/x/sync/errgroup" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqhttp" "stream.place/streamplace/pkg/aqtime" "stream.place/streamplace/pkg/atproto" "stream.place/streamplace/pkg/bus" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/livepeer" @@ -30,12 +30,12 @@ import ( "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/media" "stream.place/streamplace/pkg/model" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/renditions" "stream.place/streamplace/pkg/replication" "stream.place/streamplace/pkg/s3" "stream.place/streamplace/pkg/spmetrics" "stream.place/streamplace/pkg/statedb" - "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/thumbnail" ) diff --git a/pkg/integrations/discord/avatars.go b/pkg/integrations/discord/avatars.go index bf66c2e08..a679e3b0d 100644 --- a/pkg/integrations/discord/avatars.go +++ b/pkg/integrations/discord/avatars.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/xrpc" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqhttp" ) diff --git a/pkg/linking/linking.go b/pkg/linking/linking.go index f3051766f..7cf71e16e 100644 --- a/pkg/linking/linking.go +++ b/pkg/linking/linking.go @@ -11,8 +11,8 @@ import ( "golang.org/x/net/html" "stream.place/streamplace/pkg/config" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) type Linker struct { diff --git a/pkg/linking/linking_test.go b/pkg/linking/linking_test.go index b7880c6f5..909c6adb6 100644 --- a/pkg/linking/linking_test.go +++ b/pkg/linking/linking_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/bluesky-social/indigo/api/atproto" - "stream.place/streamplace/pkg/appbsky" - glexrt "github.com/streamplace/glex/runtime" "github.com/ipfs/go-cid" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" "stream.place/streamplace/js/app" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/lex" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/livepeer/livepeer.go b/pkg/livepeer/livepeer.go index c52c8bb0c..595b4de7c 100644 --- a/pkg/livepeer/livepeer.go +++ b/pkg/livepeer/livepeer.go @@ -18,9 +18,9 @@ import ( "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/media" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/renditions" "stream.place/streamplace/pkg/spmetrics" - "stream.place/streamplace/pkg/placestream" ) const SegmentsInFlight = 2 diff --git a/pkg/media/key_revocation.go b/pkg/media/key_revocation.go index 6baf7fc95..b0b6fecce 100644 --- a/pkg/media/key_revocation.go +++ b/pkg/media/key_revocation.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "stream.place/streamplace/pkg/comatproto" "github.com/go-gst/go-gst/gst" "stream.place/streamplace/pkg/atproto" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/model" ) diff --git a/pkg/model/beta_invite.go b/pkg/model/beta_invite.go index f612086ed..c4799317d 100644 --- a/pkg/model/beta_invite.go +++ b/pkg/model/beta_invite.go @@ -8,8 +8,8 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // BetaInvite is the indexed view of a place.stream.beta.invite diff --git a/pkg/model/beta_request.go b/pkg/model/beta_request.go index c0cfa9b4f..47dadf268 100644 --- a/pkg/model/beta_request.go +++ b/pkg/model/beta_request.go @@ -8,8 +8,8 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // BetaRequest is the indexed view of a place.stream.beta.request diff --git a/pkg/model/block.go b/pkg/model/block.go index d2a6f293b..a90b79664 100644 --- a/pkg/model/block.go +++ b/pkg/model/block.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/broadcast_origin.go b/pkg/model/broadcast_origin.go index a7c3fdaae..a2977c7a5 100644 --- a/pkg/model/broadcast_origin.go +++ b/pkg/model/broadcast_origin.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" glexrt "github.com/streamplace/glex/runtime" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) type BroadcastOrigin struct { diff --git a/pkg/model/bsky_profile.go b/pkg/model/bsky_profile.go index 4c528d078..2eeab38ea 100644 --- a/pkg/model/bsky_profile.go +++ b/pkg/model/bsky_profile.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "gorm.io/gorm/clause" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/spid" ) diff --git a/pkg/model/chat_message.go b/pkg/model/chat_message.go index 53dc36b92..20422ef09 100644 --- a/pkg/model/chat_message.go +++ b/pkg/model/chat_message.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/appbsky" - glexrt "github.com/streamplace/glex/runtime" "github.com/rivo/uniseg" + glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/feed_post.go b/pkg/model/feed_post.go index b186bc1d1..6fdb00956 100644 --- a/pkg/model/feed_post.go +++ b/pkg/model/feed_post.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" ) type FeedPost struct { diff --git a/pkg/model/label.go b/pkg/model/label.go index a6de9ec56..98462d2d3 100644 --- a/pkg/model/label.go +++ b/pkg/model/label.go @@ -4,8 +4,8 @@ import ( "bytes" "time" - "stream.place/streamplace/pkg/comatproto" "gorm.io/gorm/clause" + "stream.place/streamplace/pkg/comatproto" ) type Label struct { diff --git a/pkg/model/like.go b/pkg/model/like.go index c10a03f10..fe11df924 100644 --- a/pkg/model/like.go +++ b/pkg/model/like.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/livestream.go b/pkg/model/livestream.go index 627e94766..f9deecbcc 100644 --- a/pkg/model/livestream.go +++ b/pkg/model/livestream.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "gorm.io/gorm/clause" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/moderation" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/media_origin.go b/pkg/model/media_origin.go index 7044343d7..9dca1c279 100644 --- a/pkg/model/media_origin.go +++ b/pkg/model/media_origin.go @@ -11,8 +11,8 @@ import ( glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // MediaOrigin is the indexed view of a place.stream.media.origin diff --git a/pkg/model/media_track.go b/pkg/model/media_track.go index dfe25ef89..df504730a 100644 --- a/pkg/model/media_track.go +++ b/pkg/model/media_track.go @@ -11,8 +11,8 @@ import ( glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // MediaTrack is the indexed view of a place.stream.media.track diff --git a/pkg/model/media_view_count.go b/pkg/model/media_view_count.go index 09298139f..abbe34e63 100644 --- a/pkg/model/media_view_count.go +++ b/pkg/model/media_view_count.go @@ -11,8 +11,8 @@ import ( glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // MediaViewCount is the indexed view of a place.stream.media.viewCount diff --git a/pkg/model/media_view_count_test.go b/pkg/model/media_view_count_test.go index 4c5b34bfb..dad2f59b6 100644 --- a/pkg/model/media_view_count_test.go +++ b/pkg/model/media_view_count_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/model.go b/pkg/model/model.go index e26180445..2b0626435 100644 --- a/pkg/model/model.go +++ b/pkg/model/model.go @@ -7,12 +7,12 @@ import ( "path/filepath" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" "gorm.io/driver/sqlite" "gorm.io/gorm" "gorm.io/plugin/prometheus" + "stream.place/streamplace/pkg/appbsky" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/placestream" diff --git a/pkg/model/moderation_delegation.go b/pkg/model/moderation_delegation.go index fb9f7ada5..080422b56 100644 --- a/pkg/model/moderation_delegation.go +++ b/pkg/model/moderation_delegation.go @@ -7,13 +7,13 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) type ModerationDelegation struct { diff --git a/pkg/model/video.go b/pkg/model/video.go index 6200e8ca7..03066168f 100644 --- a/pkg/model/video.go +++ b/pkg/model/video.go @@ -7,13 +7,13 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/aqtime" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // Video is the indexed view of a place.stream.video record. Every diff --git a/pkg/model/video_list.go b/pkg/model/video_list.go index 220214cbf..7d1e6ed1e 100644 --- a/pkg/model/video_list.go +++ b/pkg/model/video_list.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" + "stream.place/streamplace/pkg/appbsky" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/video_list_test.go b/pkg/model/video_list_test.go index eeb5556a9..7da3830e6 100644 --- a/pkg/model/video_list_test.go +++ b/pkg/model/video_list_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/model/vod_comment.go b/pkg/model/vod_comment.go index 9f091da95..e3527e6ed 100644 --- a/pkg/model/vod_comment.go +++ b/pkg/model/vod_comment.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/appbsky" - glexrt "github.com/streamplace/glex/runtime" "github.com/rivo/uniseg" + glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/moderation/permissions_test.go b/pkg/moderation/permissions_test.go index 0747f7737..07337f5d4 100644 --- a/pkg/moderation/permissions_test.go +++ b/pkg/moderation/permissions_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/appbsky" glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/placestream" ) diff --git a/pkg/multitest/multitest_test.go b/pkg/multitest/multitest_test.go index 079eb3671..78576c6e4 100644 --- a/pkg/multitest/multitest_test.go +++ b/pkg/multitest/multitest_test.go @@ -14,9 +14,9 @@ import ( "time" comatproto "github.com/bluesky-social/indigo/api/atproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" scraper "github.com/starttoaster/prometheus-exporter-scraper" + glexrt "github.com/streamplace/glex/runtime" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" "stream.place/streamplace/pkg/cmd" diff --git a/pkg/replication/iroh_replicator/kv.go b/pkg/replication/iroh_replicator/kv.go index 14d1c0e98..5b2a7be0d 100644 --- a/pkg/replication/iroh_replicator/kv.go +++ b/pkg/replication/iroh_replicator/kv.go @@ -19,8 +19,8 @@ import ( "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/media" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/spmetrics" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spmetrics" ) type IrohSwarm struct { diff --git a/pkg/spxrpc/app_bsky_actor.go b/pkg/spxrpc/app_bsky_actor.go index ada4dee90..0a99cf229 100644 --- a/pkg/spxrpc/app_bsky_actor.go +++ b/pkg/spxrpc/app_bsky_actor.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - appbskytypes "stream.place/streamplace/pkg/appbsky" "github.com/labstack/echo/v4" "github.com/streamplace/oatproxy/pkg/oatproxy" + appbskytypes "stream.place/streamplace/pkg/appbsky" ) func bskyCDNURL(kind, did, cid string) *string { diff --git a/pkg/spxrpc/app_bsky_feed.go b/pkg/spxrpc/app_bsky_feed.go index c5bed9de8..f7c5fcaaf 100644 --- a/pkg/spxrpc/app_bsky_feed.go +++ b/pkg/spxrpc/app_bsky_feed.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "stream.place/streamplace/pkg/appbsky" "github.com/labstack/echo/v4" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/model" ) diff --git a/pkg/spxrpc/com_atproto_repo.go b/pkg/spxrpc/com_atproto_repo.go index e3ed8bb55..12b36b3bb 100644 --- a/pkg/spxrpc/com_atproto_repo.go +++ b/pkg/spxrpc/com_atproto_repo.go @@ -5,9 +5,9 @@ import ( "context" "errors" "fmt" + glexrt "github.com/streamplace/glex/runtime" "io" "net/http" - glexrt "github.com/streamplace/glex/runtime" "strings" "stream.place/streamplace/pkg/comatproto" diff --git a/pkg/spxrpc/labels_test.go b/pkg/spxrpc/labels_test.go index 641246443..7569185b8 100644 --- a/pkg/spxrpc/labels_test.go +++ b/pkg/spxrpc/labels_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/labstack/echo/v4" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/atproto" "stream.place/streamplace/pkg/blob" diff --git a/pkg/spxrpc/place_stream_live.go b/pkg/spxrpc/place_stream_live.go index d265075f3..e0ee74db0 100644 --- a/pkg/spxrpc/place_stream_live.go +++ b/pkg/spxrpc/place_stream_live.go @@ -12,16 +12,16 @@ import ( "strconv" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" "github.com/bluesky-social/indigo/xrpc" "github.com/gorilla/websocket" "github.com/labstack/echo/v4" + glexrt "github.com/streamplace/glex/runtime" "github.com/streamplace/oatproxy/pkg/oatproxy" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/atproto" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/lex" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/spid" diff --git a/pkg/spxrpc/place_stream_media_finalizelivestream.go b/pkg/spxrpc/place_stream_media_finalizelivestream.go index 4161fb92a..ad5d7bcd9 100644 --- a/pkg/spxrpc/place_stream_media_finalizelivestream.go +++ b/pkg/spxrpc/place_stream_media_finalizelivestream.go @@ -7,8 +7,8 @@ import ( "github.com/google/uuid" "github.com/labstack/echo/v4" "github.com/streamplace/oatproxy/pkg/oatproxy" - "stream.place/streamplace/pkg/statedb" placestream "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // handlePlaceStreamMediaFinalizeLivestream turns a finished livestream into a diff --git a/pkg/spxrpc/place_stream_moderation.go b/pkg/spxrpc/place_stream_moderation.go index 5e25e36ba..4b55b2917 100644 --- a/pkg/spxrpc/place_stream_moderation.go +++ b/pkg/spxrpc/place_stream_moderation.go @@ -7,16 +7,16 @@ import ( "net/http" "time" - "stream.place/streamplace/pkg/comatproto" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/xrpc" "github.com/labstack/echo/v4" + glexrt "github.com/streamplace/glex/runtime" + "stream.place/streamplace/pkg/appbsky" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // handlePlaceStreamModerationCreateBlock creates a block (ban) on behalf of a streamer diff --git a/pkg/spxrpc/place_stream_playback_getvideo.go b/pkg/spxrpc/place_stream_playback_getvideo.go index 205907fff..ca4f89725 100644 --- a/pkg/spxrpc/place_stream_playback_getvideo.go +++ b/pkg/spxrpc/place_stream_playback_getvideo.go @@ -17,8 +17,8 @@ import ( "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/vod" ) diff --git a/pkg/spxrpc/place_stream_playback_getvideo_test.go b/pkg/spxrpc/place_stream_playback_getvideo_test.go index 6f6865e64..c94c901f4 100644 --- a/pkg/spxrpc/place_stream_playback_getvideo_test.go +++ b/pkg/spxrpc/place_stream_playback_getvideo_test.go @@ -8,15 +8,15 @@ import ( "strings" "testing" - "stream.place/streamplace/pkg/comatproto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/labstack/echo/v4" "github.com/stretchr/testify/require" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/vod" ) diff --git a/pkg/spxrpc/place_stream_vod_drafts.go b/pkg/spxrpc/place_stream_vod_drafts.go index 9869c9f69..62f1dfcde 100644 --- a/pkg/spxrpc/place_stream_vod_drafts.go +++ b/pkg/spxrpc/place_stream_vod_drafts.go @@ -6,12 +6,12 @@ import ( "net/http" "time" - "stream.place/streamplace/pkg/comatproto" "github.com/labstack/echo/v4" "github.com/streamplace/oatproxy/pkg/oatproxy" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" placestream "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/vod" ) diff --git a/pkg/spxrpc/storage.go b/pkg/spxrpc/storage.go index 9f5138dfd..0bdea52a4 100644 --- a/pkg/spxrpc/storage.go +++ b/pkg/spxrpc/storage.go @@ -10,8 +10,8 @@ import ( "github.com/labstack/echo/v4" "github.com/streamplace/oatproxy/pkg/oatproxy" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/statedb" placestreamtypes "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func (s *Server) handlePlaceStreamServerUpsertStorage(ctx context.Context, input *placestreamtypes.ServerUpsertStorage_Input) (*placestreamtypes.ServerUpsertStorage_Output, error) { diff --git a/pkg/spxrpc/webhook.go b/pkg/spxrpc/webhook.go index 74d91d982..f6ac245a1 100644 --- a/pkg/spxrpc/webhook.go +++ b/pkg/spxrpc/webhook.go @@ -11,8 +11,8 @@ import ( "github.com/labstack/echo/v4" "github.com/streamplace/oatproxy/pkg/oatproxy" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/statedb" placestream "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) func (s *Server) handlePlaceStreamServerCreateWebhook(ctx context.Context, input *placestream.ServerCreateWebhook_Input) (*placestream.ServerCreateWebhook_Output, error) { diff --git a/pkg/statedb/draft_video.go b/pkg/statedb/draft_video.go index a62f7453a..2303d8ba6 100644 --- a/pkg/statedb/draft_video.go +++ b/pkg/statedb/draft_video.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/comatproto" glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" "gorm.io/gorm/clause" - "stream.place/streamplace/pkg/spid" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) // DraftVideo is a draft VOD: a permissioned-data-style record (CBOR-serialized, diff --git a/pkg/statedb/multistream_target.go b/pkg/statedb/multistream_target.go index 034360f6e..dbdf034c8 100644 --- a/pkg/statedb/multistream_target.go +++ b/pkg/statedb/multistream_target.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" - "stream.place/streamplace/pkg/spid" + glexrt "github.com/streamplace/glex/runtime" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/spid" ) const MAX_MULTISTREAM_TARGETS = 100 diff --git a/pkg/statedb/queue_processor.go b/pkg/statedb/queue_processor.go index df9d23a96..71f99d910 100644 --- a/pkg/statedb/queue_processor.go +++ b/pkg/statedb/queue_processor.go @@ -7,13 +7,13 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/appbsky" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/util" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/xrpc" + glexrt "github.com/streamplace/glex/runtime" "golang.org/x/sync/errgroup" "gorm.io/gorm" + "stream.place/streamplace/pkg/appbsky" "stream.place/streamplace/pkg/integrations/webhook" "stream.place/streamplace/pkg/log" notificationpkg "stream.place/streamplace/pkg/notifications" diff --git a/pkg/statedb/xrpc_stream_event.go b/pkg/statedb/xrpc_stream_event.go index 65dcd1e68..1d83de6fe 100644 --- a/pkg/statedb/xrpc_stream_event.go +++ b/pkg/statedb/xrpc_stream_event.go @@ -5,11 +5,11 @@ import ( "errors" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/util" "github.com/ipfs/go-cid" + glexrt "github.com/streamplace/glex/runtime" "gorm.io/gorm" + "stream.place/streamplace/pkg/comatproto" ) type XrpcStreamEvent struct { diff --git a/pkg/upload/upload.go b/pkg/upload/upload.go index 29cca0011..799449d38 100644 --- a/pkg/upload/upload.go +++ b/pkg/upload/upload.go @@ -32,8 +32,8 @@ import ( "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // Backend identifies which TUS data store backs an upload. diff --git a/pkg/vod/publish.go b/pkg/vod/publish.go index 87f1f7d20..98a3ecc1c 100644 --- a/pkg/vod/publish.go +++ b/pkg/vod/publish.go @@ -5,21 +5,21 @@ import ( "encoding/json" "fmt" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/xrpc" + glexrt "github.com/streamplace/glex/runtime" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/atproto" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/log" "stream.place/streamplace/pkg/media" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/statedb" - "stream.place/streamplace/pkg/placestream" ) // trackRefJSON is the shape stored in Upload.TrackURIs. diff --git a/pkg/vod/publish_draft.go b/pkg/vod/publish_draft.go index f4e1ef804..1bbb5dfb7 100644 --- a/pkg/vod/publish_draft.go +++ b/pkg/vod/publish_draft.go @@ -8,18 +8,18 @@ import ( "strings" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/xrpc" + glexrt "github.com/streamplace/glex/runtime" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/log" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // ErrDraftNotFound / ErrDraftNotReady let the publishDraft XRPC handler map diff --git a/pkg/vod/publish_draft_test.go b/pkg/vod/publish_draft_test.go index 5aeed4f1e..e29d5fd94 100644 --- a/pkg/vod/publish_draft_test.go +++ b/pkg/vod/publish_draft_test.go @@ -8,8 +8,8 @@ import ( "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/config" "stream.place/streamplace/pkg/model" - "stream.place/streamplace/pkg/statedb" "stream.place/streamplace/pkg/placestream" + "stream.place/streamplace/pkg/statedb" ) // newDraftTestState builds an in-memory statedb for draft tests that don't need diff --git a/pkg/vod/publish_video.go b/pkg/vod/publish_video.go index 7997256c5..dde1c3e41 100644 --- a/pkg/vod/publish_video.go +++ b/pkg/vod/publish_video.go @@ -8,20 +8,20 @@ import ( "fmt" "time" - "stream.place/streamplace/pkg/comatproto" - glexrt "github.com/streamplace/glex/runtime" "github.com/bluesky-social/indigo/xrpc" + glexrt "github.com/streamplace/glex/runtime" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" + "stream.place/streamplace/pkg/comatproto" "stream.place/streamplace/pkg/blob" "stream.place/streamplace/pkg/constants" "stream.place/streamplace/pkg/lex" "stream.place/streamplace/pkg/log" + "stream.place/streamplace/pkg/placestream" "stream.place/streamplace/pkg/spid" "stream.place/streamplace/pkg/statedb" - "stream.place/streamplace/pkg/placestream" ) // ErrUploadNotFound / ErrUploadNotReady let the publishVideo XRPC handler map -- 2.51.2