diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2025-04-26 15:34:10 +0200 |
|---|---|---|
| committer | Daenney <daenney@users.noreply.github.com> | 2025-04-26 15:38:43 +0200 |
| commit | ab10266bff8d3dea1655e5f98a932efa2474bdb6 (patch) | |
| tree | def81628d7a7c81b8ad0c971fb02ebc945eca75c /internal | |
| parent | [chore] Set up Github to be a mirror (diff) | |
| download | gotosocial-ab10266bff8d3dea1655e5f98a932efa2474bdb6.tar.xz | |
[feature] Move to code.superseriousbusiness.org
Diffstat (limited to 'internal')
1138 files changed, 4484 insertions, 4482 deletions
diff --git a/internal/admin/actions.go b/internal/admin/actions.go index 057bfe07d..b68061fbf 100644 --- a/internal/admin/actions.go +++ b/internal/admin/actions.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/workers" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/workers" ) func errActionConflict(action *gtsmodel.AdminAction) gtserror.WithCode { diff --git a/internal/admin/actions_test.go b/internal/admin/actions_test.go index c5084d955..653051612 100644 --- a/internal/admin/actions_test.go +++ b/internal/admin/actions_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/testrig" ) const ( diff --git a/internal/admin/domainkeys.go b/internal/admin/domainkeys.go index ad943ce80..c71f079c0 100644 --- a/internal/admin/domainkeys.go +++ b/internal/admin/domainkeys.go @@ -21,8 +21,8 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (a *Actions) DomainKeysExpireF(domain string) ActionF { diff --git a/internal/admin/domainperms.go b/internal/admin/domainperms.go index fa686df43..c54c1f93e 100644 --- a/internal/admin/domainperms.go +++ b/internal/admin/domainperms.go @@ -24,13 +24,13 @@ import ( "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // Returns an AdminActionF for diff --git a/internal/admin/util.go b/internal/admin/util.go index 27e81fbb3..0d0974a5a 100644 --- a/internal/admin/util.go +++ b/internal/admin/util.go @@ -22,9 +22,9 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // stubbifyInstance renders the given instance as a stub, diff --git a/internal/ap/activitystreams_test.go b/internal/ap/activitystreams_test.go index fbeef262c..ab64f4b6b 100644 --- a/internal/ap/activitystreams_test.go +++ b/internal/ap/activitystreams_test.go @@ -22,10 +22,10 @@ import ( "testing" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) func TestASCollection(t *testing.T) { diff --git a/internal/ap/ap_test.go b/internal/ap/ap_test.go index 8455426e4..6d02412f2 100644 --- a/internal/ap/ap_test.go +++ b/internal/ap/ap_test.go @@ -25,10 +25,10 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) func document1() vocab.ActivityStreamsDocument { diff --git a/internal/ap/collections.go b/internal/ap/collections.go index 08a91e5cd..d3c8e80f5 100644 --- a/internal/ap/collections.go +++ b/internal/ap/collections.go @@ -23,7 +23,7 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // TODO: replace must of this logic with just diff --git a/internal/ap/collections_test.go b/internal/ap/collections_test.go index f5fec6b31..0772d7bb0 100644 --- a/internal/ap/collections_test.go +++ b/internal/ap/collections_test.go @@ -25,7 +25,7 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/ap" ) var testIteratorIRIs = [][]string{ diff --git a/internal/ap/extract.go b/internal/ap/extract.go index 596e29b13..5fdf4962c 100644 --- a/internal/ap/extract.go +++ b/internal/ap/extract.go @@ -30,10 +30,10 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // ExtractObjects will extract object vocab.Types from given implementing interface. diff --git a/internal/ap/extractattachments_test.go b/internal/ap/extractattachments_test.go index b9192bfb0..f3af66708 100644 --- a/internal/ap/extractattachments_test.go +++ b/internal/ap/extractattachments_test.go @@ -23,8 +23,8 @@ import ( "testing" "code.superseriousbusiness.org/activity/streams" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractAttachmentsTestSuite struct { diff --git a/internal/ap/extractcontent_test.go b/internal/ap/extractcontent_test.go index c899a10e1..14c974e5b 100644 --- a/internal/ap/extractcontent_test.go +++ b/internal/ap/extractcontent_test.go @@ -20,8 +20,8 @@ package ap_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractContentTestSuite struct { diff --git a/internal/ap/extractemojis_test.go b/internal/ap/extractemojis_test.go index 69406f322..eba30b8b8 100644 --- a/internal/ap/extractemojis_test.go +++ b/internal/ap/extractemojis_test.go @@ -23,8 +23,8 @@ import ( "io" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractEmojisTestSuite struct { diff --git a/internal/ap/extractfocus_test.go b/internal/ap/extractfocus_test.go index 9e7935740..e7f922930 100644 --- a/internal/ap/extractfocus_test.go +++ b/internal/ap/extractfocus_test.go @@ -24,8 +24,8 @@ import ( "testing" "code.superseriousbusiness.org/activity/streams" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractFocusTestSuite struct { diff --git a/internal/ap/extracthashtags_test.go b/internal/ap/extracthashtags_test.go index 1d4fbcf6f..9409b511b 100644 --- a/internal/ap/extracthashtags_test.go +++ b/internal/ap/extracthashtags_test.go @@ -20,8 +20,8 @@ package ap_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractHashtagsTestSuite struct { diff --git a/internal/ap/extractmentions_test.go b/internal/ap/extractmentions_test.go index 96d7ca656..a5b107a99 100644 --- a/internal/ap/extractmentions_test.go +++ b/internal/ap/extractmentions_test.go @@ -21,9 +21,9 @@ import ( "testing" "code.superseriousbusiness.org/activity/streams" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ExtractMentionsTestSuite struct { diff --git a/internal/ap/extractpolicy_test.go b/internal/ap/extractpolicy_test.go index 3d5e75c41..a5e8db6a7 100644 --- a/internal/ap/extractpolicy_test.go +++ b/internal/ap/extractpolicy_test.go @@ -23,9 +23,9 @@ import ( "io" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ExtractPolicyTestSuite struct { diff --git a/internal/ap/extractpubkey_test.go b/internal/ap/extractpubkey_test.go index eeffaa1b2..ab4f38a22 100644 --- a/internal/ap/extractpubkey_test.go +++ b/internal/ap/extractpubkey_test.go @@ -24,8 +24,8 @@ import ( "code.superseriousbusiness.org/activity/streams" typepublickey "code.superseriousbusiness.org/activity/streams/impl/w3idsecurityv1/type_publickey" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) const ( diff --git a/internal/ap/extractsensitive_test.go b/internal/ap/extractsensitive_test.go index ce5571680..3cdce2254 100644 --- a/internal/ap/extractsensitive_test.go +++ b/internal/ap/extractsensitive_test.go @@ -20,8 +20,8 @@ package ap_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" ) type ExtractSensitiveTestSuite struct { diff --git a/internal/ap/extractvisibility_test.go b/internal/ap/extractvisibility_test.go index 3c894f4a5..ba5718506 100644 --- a/internal/ap/extractvisibility_test.go +++ b/internal/ap/extractvisibility_test.go @@ -20,9 +20,9 @@ package ap_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ExtractVisibilityTestSuite struct { diff --git a/internal/ap/interfaces_test.go b/internal/ap/interfaces_test.go index 507a0c59c..6bb51813f 100644 --- a/internal/ap/interfaces_test.go +++ b/internal/ap/interfaces_test.go @@ -19,7 +19,7 @@ package ap_test import ( "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/ap" ) var ( diff --git a/internal/ap/normalize.go b/internal/ap/normalize.go index b2c4b727e..f6608ed94 100644 --- a/internal/ap/normalize.go +++ b/internal/ap/normalize.go @@ -20,8 +20,8 @@ package ap import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/text" ) /* diff --git a/internal/ap/normalize_test.go b/internal/ap/normalize_test.go index 14de3c93c..9f7788162 100644 --- a/internal/ap/normalize_test.go +++ b/internal/ap/normalize_test.go @@ -21,9 +21,9 @@ import ( "testing" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/testrig" ) type NormalizeTestSuite struct { diff --git a/internal/ap/properties.go b/internal/ap/properties.go index 589639337..b5154c0aa 100644 --- a/internal/ap/properties.go +++ b/internal/ap/properties.go @@ -24,7 +24,7 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // MustGet performs the given 'Get$Property(with) (T, error)' signature function, panicking on error. diff --git a/internal/ap/resolve.go b/internal/ap/resolve.go index 596de1a99..45107df69 100644 --- a/internal/ap/resolve.go +++ b/internal/ap/resolve.go @@ -28,7 +28,7 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // ResolveActivity is a util function for pulling a pub.Activity type out of an incoming request body, diff --git a/internal/ap/resolve_test.go b/internal/ap/resolve_test.go index b70dba77b..a5e279fa2 100644 --- a/internal/ap/resolve_test.go +++ b/internal/ap/resolve_test.go @@ -23,9 +23,9 @@ import ( "io" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) type ResolveTestSuite struct { diff --git a/internal/ap/serialize.go b/internal/ap/serialize.go index b18fcc959..c64c14d75 100644 --- a/internal/ap/serialize.go +++ b/internal/ap/serialize.go @@ -20,7 +20,7 @@ package ap import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // Serialize is a custom serializer for ActivityStreams types. diff --git a/internal/api/activitypub.go b/internal/api/activitypub.go index 0c0222d1c..0a8a05d0f 100644 --- a/internal/api/activitypub.go +++ b/internal/api/activitypub.go @@ -18,14 +18,14 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/emoji" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/publickey" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/emoji" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/publickey" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type ActivityPub struct { diff --git a/internal/api/activitypub/emoji/emoji.go b/internal/api/activitypub/emoji/emoji.go index f67943a93..361a3bbc7 100644 --- a/internal/api/activitypub/emoji/emoji.go +++ b/internal/api/activitypub/emoji/emoji.go @@ -20,8 +20,8 @@ package emoji import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/activitypub/emoji/emojiget.go b/internal/api/activitypub/emoji/emojiget.go index 5a9f0db72..cc0049f89 100644 --- a/internal/api/activitypub/emoji/emojiget.go +++ b/internal/api/activitypub/emoji/emojiget.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) EmojiGetHandler(c *gin.Context) { diff --git a/internal/api/activitypub/emoji/emojiget_test.go b/internal/api/activitypub/emoji/emojiget_test.go index 11b66f5c2..071cb80b6 100644 --- a/internal/api/activitypub/emoji/emojiget_test.go +++ b/internal/api/activitypub/emoji/emojiget_test.go @@ -23,21 +23,21 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/emoji" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/emoji" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmojiGetTestSuite struct { diff --git a/internal/api/activitypub/publickey/publickey.go b/internal/api/activitypub/publickey/publickey.go index c2a6accb4..161123048 100644 --- a/internal/api/activitypub/publickey/publickey.go +++ b/internal/api/activitypub/publickey/publickey.go @@ -20,9 +20,9 @@ package publickey import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/uris" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) const ( diff --git a/internal/api/activitypub/publickey/publickeyget.go b/internal/api/activitypub/publickey/publickeyget.go index 083a31961..6e050a3b5 100644 --- a/internal/api/activitypub/publickey/publickeyget.go +++ b/internal/api/activitypub/publickey/publickeyget.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PublicKeyGETHandler should be served at eg https://example.org/users/:username/main-key. diff --git a/internal/api/activitypub/users/acceptget.go b/internal/api/activitypub/users/acceptget.go index 4d0630df7..aba5e5a7c 100644 --- a/internal/api/activitypub/users/acceptget.go +++ b/internal/api/activitypub/users/acceptget.go @@ -20,9 +20,9 @@ package users import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AcceptGETHandler serves an interaction request as an ActivityStreams Accept. diff --git a/internal/api/activitypub/users/featured.go b/internal/api/activitypub/users/featured.go index b8b4fe681..90b368b26 100644 --- a/internal/api/activitypub/users/featured.go +++ b/internal/api/activitypub/users/featured.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FeaturedCollectionGETHandler swagger:operation GET /users/{username}/collections/featured s2sFeaturedCollectionGet diff --git a/internal/api/activitypub/users/followers.go b/internal/api/activitypub/users/followers.go index 956cdc71e..f00b7bc40 100644 --- a/internal/api/activitypub/users/followers.go +++ b/internal/api/activitypub/users/followers.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // FollowersGETHandler returns a collection of URIs for followers of the target user, formatted so that other AP servers can understand it. diff --git a/internal/api/activitypub/users/following.go b/internal/api/activitypub/users/following.go index d01b55b57..630e0b821 100644 --- a/internal/api/activitypub/users/following.go +++ b/internal/api/activitypub/users/following.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // FollowingGETHandler returns a collection of URIs for accounts that the target user follows, formatted so that other AP servers can understand it. diff --git a/internal/api/activitypub/users/inboxpost.go b/internal/api/activitypub/users/inboxpost.go index b0a9a49ee..01e1a834a 100644 --- a/internal/api/activitypub/users/inboxpost.go +++ b/internal/api/activitypub/users/inboxpost.go @@ -20,10 +20,10 @@ package users import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" errorsv2 "codeberg.org/gruf/go-errors/v2" ) diff --git a/internal/api/activitypub/users/inboxpost_test.go b/internal/api/activitypub/users/inboxpost_test.go index a2faa078f..e00a705a0 100644 --- a/internal/api/activitypub/users/inboxpost_test.go +++ b/internal/api/activitypub/users/inboxpost_test.go @@ -31,15 +31,15 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InboxPostTestSuite struct { diff --git a/internal/api/activitypub/users/outboxget.go b/internal/api/activitypub/users/outboxget.go index 43379ad8f..64bcc195b 100644 --- a/internal/api/activitypub/users/outboxget.go +++ b/internal/api/activitypub/users/outboxget.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // OutboxGETHandler swagger:operation GET /users/{username}/outbox s2sOutboxGet diff --git a/internal/api/activitypub/users/outboxget_test.go b/internal/api/activitypub/users/outboxget_test.go index 2f56b2153..dc9c621a6 100644 --- a/internal/api/activitypub/users/outboxget_test.go +++ b/internal/api/activitypub/users/outboxget_test.go @@ -29,10 +29,10 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/testrig" ) type OutboxGetTestSuite struct { diff --git a/internal/api/activitypub/users/repliesget.go b/internal/api/activitypub/users/repliesget.go index 2d3472f35..3a8a81bfb 100644 --- a/internal/api/activitypub/users/repliesget.go +++ b/internal/api/activitypub/users/repliesget.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // StatusRepliesGETHandler swagger:operation GET /users/{username}/statuses/{status}/replies s2sRepliesGet diff --git a/internal/api/activitypub/users/repliesget_test.go b/internal/api/activitypub/users/repliesget_test.go index ce3b20985..9d2141811 100644 --- a/internal/api/activitypub/users/repliesget_test.go +++ b/internal/api/activitypub/users/repliesget_test.go @@ -28,12 +28,12 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RepliesGetTestSuite struct { diff --git a/internal/api/activitypub/users/statusget.go b/internal/api/activitypub/users/statusget.go index 27af9c6b4..45b7847bf 100644 --- a/internal/api/activitypub/users/statusget.go +++ b/internal/api/activitypub/users/statusget.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusGETHandler serves the target status as an activitystreams NOTE so that other AP servers can parse it. diff --git a/internal/api/activitypub/users/statusget_test.go b/internal/api/activitypub/users/statusget_test.go index ec7a032ae..dc3aef5a7 100644 --- a/internal/api/activitypub/users/statusget_test.go +++ b/internal/api/activitypub/users/statusget_test.go @@ -28,10 +28,10 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusGetTestSuite struct { diff --git a/internal/api/activitypub/users/user.go b/internal/api/activitypub/users/user.go index 5122e610e..7a06e6f03 100644 --- a/internal/api/activitypub/users/user.go +++ b/internal/api/activitypub/users/user.go @@ -20,10 +20,10 @@ package users import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/uris" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) const ( diff --git a/internal/api/activitypub/users/user_test.go b/internal/api/activitypub/users/user_test.go index f86890231..b0b90dad4 100644 --- a/internal/api/activitypub/users/user_test.go +++ b/internal/api/activitypub/users/user_test.go @@ -18,21 +18,21 @@ package users_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type UserStandardTestSuite struct { diff --git a/internal/api/activitypub/users/userget.go b/internal/api/activitypub/users/userget.go index 2deca0fa4..00d8a0f1f 100644 --- a/internal/api/activitypub/users/userget.go +++ b/internal/api/activitypub/users/userget.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // UsersGETHandler should be served at https://example.org/users/:username. diff --git a/internal/api/activitypub/users/userget_test.go b/internal/api/activitypub/users/userget_test.go index d70d1504b..06bc46452 100644 --- a/internal/api/activitypub/users/userget_test.go +++ b/internal/api/activitypub/users/userget_test.go @@ -27,10 +27,10 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/api/activitypub/users" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/activitypub/users" - "github.com/superseriousbusiness/gotosocial/testrig" ) type UserGetTestSuite struct { diff --git a/internal/api/auth.go b/internal/api/auth.go index ec36d95d1..2504acb30 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -18,14 +18,14 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/auth" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/auth" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" - "github.com/superseriousbusiness/gotosocial/internal/state" ) type Auth struct { diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 37c4e864a..a39da9fd5 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -20,10 +20,10 @@ package auth import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" ) const ( diff --git a/internal/api/auth/auth_test.go b/internal/api/auth/auth_test.go index af90de2d6..8082f4aed 100644 --- a/internal/api/auth/auth_test.go +++ b/internal/api/auth/auth_test.go @@ -22,24 +22,24 @@ import ( "fmt" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/auth" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/memstore" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/auth" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AuthStandardTestSuite struct { diff --git a/internal/api/auth/authorize.go b/internal/api/auth/authorize.go index 5b3e6ea3c..c6c648b01 100644 --- a/internal/api/auth/authorize.go +++ b/internal/api/auth/authorize.go @@ -22,14 +22,14 @@ import ( "net/url" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) // AuthorizeGETHandler should be served as diff --git a/internal/api/auth/authorize_test.go b/internal/api/auth/authorize_test.go index 54df4c5e5..b73f5e0e1 100644 --- a/internal/api/auth/authorize_test.go +++ b/internal/api/auth/authorize_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/auth" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-contrib/sessions" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/auth" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type AuthAuthorizeTestSuite struct { diff --git a/internal/api/auth/callback.go b/internal/api/auth/callback.go index 5003910e9..608ee1bd4 100644 --- a/internal/api/auth/callback.go +++ b/internal/api/auth/callback.go @@ -26,17 +26,17 @@ import ( "slices" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/oidc" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/google/uuid" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/oidc" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // extraInfo wraps a form-submitted username and transmitted name diff --git a/internal/api/auth/callback_test.go b/internal/api/auth/callback_test.go index 2624f3f3f..3151ecaa2 100644 --- a/internal/api/auth/callback_test.go +++ b/internal/api/auth/callback_test.go @@ -3,7 +3,7 @@ package auth import ( "testing" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/testrig" ) func TestAdminGroup(t *testing.T) { diff --git a/internal/api/auth/oob.go b/internal/api/auth/oob.go index c723a1cb5..49027940a 100644 --- a/internal/api/auth/oob.go +++ b/internal/api/auth/oob.go @@ -20,9 +20,9 @@ package auth import ( "errors" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // OOBTokenGETHandler parses the OAuth code from the query diff --git a/internal/api/auth/revoke.go b/internal/api/auth/revoke.go index 932e83dbc..c5167889c 100644 --- a/internal/api/auth/revoke.go +++ b/internal/api/auth/revoke.go @@ -20,10 +20,10 @@ package auth import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" oautherr "code.superseriousbusiness.org/oauth2/v4/errors" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // TokenRevokePOSTHandler swagger:operation POST /oauth/revoke oauthTokenRevoke diff --git a/internal/api/auth/revoke_test.go b/internal/api/auth/revoke_test.go index a654ceda5..e482c8aac 100644 --- a/internal/api/auth/revoke_test.go +++ b/internal/api/auth/revoke_test.go @@ -25,9 +25,9 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RevokeTestSuite struct { diff --git a/internal/api/auth/signin.go b/internal/api/auth/signin.go index 3503f37bb..845ea2594 100644 --- a/internal/api/auth/signin.go +++ b/internal/api/auth/signin.go @@ -25,15 +25,15 @@ import ( "slices" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "codeberg.org/gruf/go-byteutil" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "github.com/pquerna/otp/totp" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/api/auth/token.go b/internal/api/auth/token.go index d9f0d8154..95693dea6 100644 --- a/internal/api/auth/token.go +++ b/internal/api/auth/token.go @@ -21,9 +21,9 @@ import ( "net/http" "net/url" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-gonic/gin" ) diff --git a/internal/api/auth/token_test.go b/internal/api/auth/token_test.go index 1a12fe37e..e333a8867 100644 --- a/internal/api/auth/token_test.go +++ b/internal/api/auth/token_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TokenTestSuite struct { diff --git a/internal/api/auth/util.go b/internal/api/auth/util.go index f1aed0bc3..937de3d85 100644 --- a/internal/api/auth/util.go +++ b/internal/api/auth/util.go @@ -20,12 +20,12 @@ package auth import ( "errors" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) func (m *Module) mustClearSession(s sessions.Session) { diff --git a/internal/api/client.go b/internal/api/client.go index a928176de..0b977e59f 100644 --- a/internal/api/client.go +++ b/internal/api/client.go @@ -20,47 +20,47 @@ package api import ( "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/announcements" + "code.superseriousbusiness.org/gotosocial/internal/api/client/apps" + "code.superseriousbusiness.org/gotosocial/internal/api/client/blocks" + "code.superseriousbusiness.org/gotosocial/internal/api/client/bookmarks" + "code.superseriousbusiness.org/gotosocial/internal/api/client/conversations" + "code.superseriousbusiness.org/gotosocial/internal/api/client/customemojis" + "code.superseriousbusiness.org/gotosocial/internal/api/client/exports" + "code.superseriousbusiness.org/gotosocial/internal/api/client/favourites" + "code.superseriousbusiness.org/gotosocial/internal/api/client/featuredtags" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followedtags" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followrequests" + importdata "code.superseriousbusiness.org/gotosocial/internal/api/client/import" + "code.superseriousbusiness.org/gotosocial/internal/api/client/instance" + "code.superseriousbusiness.org/gotosocial/internal/api/client/interactionpolicies" + "code.superseriousbusiness.org/gotosocial/internal/api/client/interactionrequests" + "code.superseriousbusiness.org/gotosocial/internal/api/client/lists" + "code.superseriousbusiness.org/gotosocial/internal/api/client/markers" + "code.superseriousbusiness.org/gotosocial/internal/api/client/media" + "code.superseriousbusiness.org/gotosocial/internal/api/client/mutes" + "code.superseriousbusiness.org/gotosocial/internal/api/client/notifications" + "code.superseriousbusiness.org/gotosocial/internal/api/client/polls" + "code.superseriousbusiness.org/gotosocial/internal/api/client/preferences" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + "code.superseriousbusiness.org/gotosocial/internal/api/client/reports" + "code.superseriousbusiness.org/gotosocial/internal/api/client/search" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/api/client/streaming" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tags" + "code.superseriousbusiness.org/gotosocial/internal/api/client/timelines" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tokens" + "code.superseriousbusiness.org/gotosocial/internal/api/client/user" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/announcements" - "github.com/superseriousbusiness/gotosocial/internal/api/client/apps" - "github.com/superseriousbusiness/gotosocial/internal/api/client/blocks" - "github.com/superseriousbusiness/gotosocial/internal/api/client/bookmarks" - "github.com/superseriousbusiness/gotosocial/internal/api/client/conversations" - "github.com/superseriousbusiness/gotosocial/internal/api/client/customemojis" - "github.com/superseriousbusiness/gotosocial/internal/api/client/exports" - "github.com/superseriousbusiness/gotosocial/internal/api/client/favourites" - "github.com/superseriousbusiness/gotosocial/internal/api/client/featuredtags" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followedtags" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followrequests" - importdata "github.com/superseriousbusiness/gotosocial/internal/api/client/import" - "github.com/superseriousbusiness/gotosocial/internal/api/client/instance" - "github.com/superseriousbusiness/gotosocial/internal/api/client/interactionpolicies" - "github.com/superseriousbusiness/gotosocial/internal/api/client/interactionrequests" - "github.com/superseriousbusiness/gotosocial/internal/api/client/lists" - "github.com/superseriousbusiness/gotosocial/internal/api/client/markers" - "github.com/superseriousbusiness/gotosocial/internal/api/client/media" - "github.com/superseriousbusiness/gotosocial/internal/api/client/mutes" - "github.com/superseriousbusiness/gotosocial/internal/api/client/notifications" - "github.com/superseriousbusiness/gotosocial/internal/api/client/polls" - "github.com/superseriousbusiness/gotosocial/internal/api/client/preferences" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - "github.com/superseriousbusiness/gotosocial/internal/api/client/reports" - "github.com/superseriousbusiness/gotosocial/internal/api/client/search" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/api/client/streaming" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tags" - "github.com/superseriousbusiness/gotosocial/internal/api/client/timelines" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tokens" - "github.com/superseriousbusiness/gotosocial/internal/api/client/user" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" - "github.com/superseriousbusiness/gotosocial/internal/state" ) type Client struct { diff --git a/internal/api/client/accounts/account_test.go b/internal/api/client/accounts/account_test.go index 27e09cab4..a75a6f4cf 100644 --- a/internal/api/client/accounts/account_test.go +++ b/internal/api/client/accounts/account_test.go @@ -23,21 +23,21 @@ import ( "net/http" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountStandardTestSuite struct { diff --git a/internal/api/client/accounts/accountalias.go b/internal/api/client/accounts/accountalias.go index e0b67694f..51183bff7 100644 --- a/internal/api/client/accounts/accountalias.go +++ b/internal/api/client/accounts/accountalias.go @@ -20,10 +20,10 @@ package accounts import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountAliasPOSTHandler swagger:operation POST /api/v1/accounts/alias accountAlias diff --git a/internal/api/client/accounts/accountcreate.go b/internal/api/client/accounts/accountcreate.go index 71f343522..ef45c7529 100644 --- a/internal/api/client/accounts/accountcreate.go +++ b/internal/api/client/accounts/accountcreate.go @@ -22,11 +22,11 @@ import ( "net" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // AccountCreatePOSTHandler swagger:operation POST /api/v1/accounts accountCreate diff --git a/internal/api/client/accounts/accountdelete.go b/internal/api/client/accounts/accountdelete.go index 90fcd6eef..e7682b2ce 100644 --- a/internal/api/client/accounts/accountdelete.go +++ b/internal/api/client/accounts/accountdelete.go @@ -21,11 +21,11 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "codeberg.org/gruf/go-byteutil" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/api/client/accounts/accountdelete_test.go b/internal/api/client/accounts/accountdelete_test.go index 66a5fa097..34854750b 100644 --- a/internal/api/client/accounts/accountdelete_test.go +++ b/internal/api/client/accounts/accountdelete_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountDeleteTestSuite struct { diff --git a/internal/api/client/accounts/accountget.go b/internal/api/client/accounts/accountget.go index cc6de3337..c28635a86 100644 --- a/internal/api/client/accounts/accountget.go +++ b/internal/api/client/accounts/accountget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountGETHandler swagger:operation GET /api/v1/accounts/{id} accountGet diff --git a/internal/api/client/accounts/accountget_test.go b/internal/api/client/accounts/accountget_test.go index 421de0d64..6ec15597f 100644 --- a/internal/api/client/accounts/accountget_test.go +++ b/internal/api/client/accounts/accountget_test.go @@ -24,10 +24,10 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" ) type AccountGetTestSuite struct { diff --git a/internal/api/client/accounts/accountmove.go b/internal/api/client/accounts/accountmove.go index 601dd7d54..cdb2cdddb 100644 --- a/internal/api/client/accounts/accountmove.go +++ b/internal/api/client/accounts/accountmove.go @@ -20,10 +20,10 @@ package accounts import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountMovePOSTHandler swagger:operation POST /api/v1/accounts/move accountMove diff --git a/internal/api/client/accounts/accounts.go b/internal/api/client/accounts/accounts.go index f21d23185..fb6ce61e1 100644 --- a/internal/api/client/accounts/accounts.go +++ b/internal/api/client/accounts/accounts.go @@ -20,8 +20,8 @@ package accounts import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/accounts/accountupdate.go b/internal/api/client/accounts/accountupdate.go index 50e6632f4..58ba0dd2e 100644 --- a/internal/api/client/accounts/accountupdate.go +++ b/internal/api/client/accounts/accountupdate.go @@ -24,12 +24,12 @@ import ( "slices" "strconv" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/form/v4" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountUpdateCredentialsPATCHHandler swagger:operation PATCH /api/v1/accounts/update_credentials accountUpdate diff --git a/internal/api/client/accounts/accountupdate_test.go b/internal/api/client/accounts/accountupdate_test.go index d0def500c..1ab9f1fce 100644 --- a/internal/api/client/accounts/accountupdate_test.go +++ b/internal/api/client/accounts/accountupdate_test.go @@ -27,11 +27,11 @@ import ( "net/url" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountUpdateTestSuite struct { diff --git a/internal/api/client/accounts/accountverify.go b/internal/api/client/accounts/accountverify.go index f9dd5ae9c..dda3c10c6 100644 --- a/internal/api/client/accounts/accountverify.go +++ b/internal/api/client/accounts/accountverify.go @@ -20,9 +20,9 @@ package accounts import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountVerifyGETHandler swagger:operation GET /api/v1/accounts/verify_credentials accountVerify diff --git a/internal/api/client/accounts/accountverify_test.go b/internal/api/client/accounts/accountverify_test.go index eaa22abcf..615466d57 100644 --- a/internal/api/client/accounts/accountverify_test.go +++ b/internal/api/client/accounts/accountverify_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) type AccountVerifyTestSuite struct { diff --git a/internal/api/client/accounts/block.go b/internal/api/client/accounts/block.go index 09bf23a85..066ce0c31 100644 --- a/internal/api/client/accounts/block.go +++ b/internal/api/client/accounts/block.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountBlockPOSTHandler swagger:operation POST /api/v1/accounts/{id}/block accountBlock diff --git a/internal/api/client/accounts/block_test.go b/internal/api/client/accounts/block_test.go index 079e7a673..96390841c 100644 --- a/internal/api/client/accounts/block_test.go +++ b/internal/api/client/accounts/block_test.go @@ -25,12 +25,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type BlockTestSuite struct { diff --git a/internal/api/client/accounts/featuredtags.go b/internal/api/client/accounts/featuredtags.go index 0cb3c7b98..eae3fbdf1 100644 --- a/internal/api/client/accounts/featuredtags.go +++ b/internal/api/client/accounts/featuredtags.go @@ -20,9 +20,9 @@ package accounts import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountFeaturedTagsGETHandler swagger:operation GET /api/v1/accounts/{id}/featured_tags accountsFeaturedTags diff --git a/internal/api/client/accounts/follow.go b/internal/api/client/accounts/follow.go index d72032066..e89cfc40f 100644 --- a/internal/api/client/accounts/follow.go +++ b/internal/api/client/accounts/follow.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountFollowPOSTHandler swagger:operation POST /api/v1/accounts/{id}/follow accountFollow diff --git a/internal/api/client/accounts/follow_test.go b/internal/api/client/accounts/follow_test.go index bc6a54735..d87b8c9b9 100644 --- a/internal/api/client/accounts/follow_test.go +++ b/internal/api/client/accounts/follow_test.go @@ -30,14 +30,14 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" "github.com/tomnomnom/linkheader" ) diff --git a/internal/api/client/accounts/followers.go b/internal/api/client/accounts/followers.go index d1fca7918..a813e9f00 100644 --- a/internal/api/client/accounts/followers.go +++ b/internal/api/client/accounts/followers.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // AccountFollowersGETHandler swagger:operation GET /api/v1/accounts/{id}/followers accountFollowers diff --git a/internal/api/client/accounts/following.go b/internal/api/client/accounts/following.go index b0d47667f..694e95ccd 100644 --- a/internal/api/client/accounts/following.go +++ b/internal/api/client/accounts/following.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // AccountFollowingGETHandler swagger:operation GET /api/v1/accounts/{id}/following accountFollowing diff --git a/internal/api/client/accounts/lists.go b/internal/api/client/accounts/lists.go index f054b73bb..23a137533 100644 --- a/internal/api/client/accounts/lists.go +++ b/internal/api/client/accounts/lists.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountListsGETHandler swagger:operation GET /api/v1/accounts/{id}/lists accountLists diff --git a/internal/api/client/accounts/lists_test.go b/internal/api/client/accounts/lists_test.go index 95b50b1d3..bdb004cca 100644 --- a/internal/api/client/accounts/lists_test.go +++ b/internal/api/client/accounts/lists_test.go @@ -24,11 +24,11 @@ import ( "net/http/httptest" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ListsTestSuite struct { diff --git a/internal/api/client/accounts/lookup.go b/internal/api/client/accounts/lookup.go index 88cf7fbe9..03657a20a 100644 --- a/internal/api/client/accounts/lookup.go +++ b/internal/api/client/accounts/lookup.go @@ -20,9 +20,9 @@ package accounts import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountLookupGETHandler swagger:operation GET /api/v1/accounts/lookup accountLookupGet diff --git a/internal/api/client/accounts/mute.go b/internal/api/client/accounts/mute.go index c5e5cc24b..e9884eafd 100644 --- a/internal/api/client/accounts/mute.go +++ b/internal/api/client/accounts/mute.go @@ -21,11 +21,11 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // AccountMutePOSTHandler swagger:operation POST /api/v1/accounts/{id}/mute accountMute diff --git a/internal/api/client/accounts/mute_test.go b/internal/api/client/accounts/mute_test.go index d181a2e3b..4e58031e0 100644 --- a/internal/api/client/accounts/mute_test.go +++ b/internal/api/client/accounts/mute_test.go @@ -27,13 +27,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MuteTestSuite struct { diff --git a/internal/api/client/accounts/note.go b/internal/api/client/accounts/note.go index bee99cf1e..2461487e8 100644 --- a/internal/api/client/accounts/note.go +++ b/internal/api/client/accounts/note.go @@ -20,10 +20,10 @@ package accounts import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountNotePOSTHandler swagger:operation POST /api/v1/accounts/{id}/note accountNote diff --git a/internal/api/client/accounts/profile.go b/internal/api/client/accounts/profile.go index 16c312685..6f9194ba9 100644 --- a/internal/api/client/accounts/profile.go +++ b/internal/api/client/accounts/profile.go @@ -21,11 +21,11 @@ import ( "context" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // AccountAvatarDELETEHandler swagger:operation DELETE /api/v1/profile/avatar accountAvatarDelete diff --git a/internal/api/client/accounts/profile_test.go b/internal/api/client/accounts/profile_test.go index f6d97c014..d499fc3e3 100644 --- a/internal/api/client/accounts/profile_test.go +++ b/internal/api/client/accounts/profile_test.go @@ -26,13 +26,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountProfileTestSuite struct { diff --git a/internal/api/client/accounts/relationships.go b/internal/api/client/accounts/relationships.go index 7a5589832..33a8c20d9 100644 --- a/internal/api/client/accounts/relationships.go +++ b/internal/api/client/accounts/relationships.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountRelationshipsGETHandler swagger:operation GET /api/v1/accounts/relationships accountRelationships diff --git a/internal/api/client/accounts/search.go b/internal/api/client/accounts/search.go index 671afece2..1c3166c29 100644 --- a/internal/api/client/accounts/search.go +++ b/internal/api/client/accounts/search.go @@ -20,9 +20,9 @@ package accounts import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountSearchGETHandler swagger:operation GET /api/v1/accounts/search accountSearchGet diff --git a/internal/api/client/accounts/search_test.go b/internal/api/client/accounts/search_test.go index f5216d5b9..69c42eda3 100644 --- a/internal/api/client/accounts/search_test.go +++ b/internal/api/client/accounts/search_test.go @@ -27,14 +27,14 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountSearchTestSuite struct { diff --git a/internal/api/client/accounts/statuses.go b/internal/api/client/accounts/statuses.go index c9f7977d8..9cfb7db85 100644 --- a/internal/api/client/accounts/statuses.go +++ b/internal/api/client/accounts/statuses.go @@ -23,9 +23,9 @@ import ( "net/http" "strconv" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountStatusesGETHandler swagger:operation GET /api/v1/accounts/{id}/statuses accountStatuses diff --git a/internal/api/client/accounts/statuses_test.go b/internal/api/client/accounts/statuses_test.go index f7a304967..6e83c212d 100644 --- a/internal/api/client/accounts/statuses_test.go +++ b/internal/api/client/accounts/statuses_test.go @@ -25,11 +25,11 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) type AccountStatusesTestSuite struct { diff --git a/internal/api/client/accounts/themesget.go b/internal/api/client/accounts/themesget.go index 6055a619f..f1204e85e 100644 --- a/internal/api/client/accounts/themesget.go +++ b/internal/api/client/accounts/themesget.go @@ -20,9 +20,9 @@ package accounts import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountThemesGETHandler swagger:operation GET /api/v1/accounts/themes accountThemes diff --git a/internal/api/client/accounts/unblock.go b/internal/api/client/accounts/unblock.go index 615d62e60..0f725967f 100644 --- a/internal/api/client/accounts/unblock.go +++ b/internal/api/client/accounts/unblock.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountUnblockPOSTHandler swagger:operation POST /api/v1/accounts/{id}/unblock accountUnblock diff --git a/internal/api/client/accounts/unfollow.go b/internal/api/client/accounts/unfollow.go index 1372a4ffc..458232b73 100644 --- a/internal/api/client/accounts/unfollow.go +++ b/internal/api/client/accounts/unfollow.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountUnfollowPOSTHandler swagger:operation POST /api/v1/accounts/{id}/unfollow accountUnfollow diff --git a/internal/api/client/accounts/unmute.go b/internal/api/client/accounts/unmute.go index 0336e920f..eaee047f7 100644 --- a/internal/api/client/accounts/unmute.go +++ b/internal/api/client/accounts/unmute.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountUnmutePOSTHandler swagger:operation POST /api/v1/accounts/{id}/unmute accountUnmute diff --git a/internal/api/client/accounts/unmute_test.go b/internal/api/client/accounts/unmute_test.go index 5a00c3610..799c346f0 100644 --- a/internal/api/client/accounts/unmute_test.go +++ b/internal/api/client/accounts/unmute_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - "github.com/superseriousbusiness/gotosocial/internal/api/client/accounts" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/accounts" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *MuteTestSuite) postUnmute( diff --git a/internal/api/client/admin/accountaction.go b/internal/api/client/admin/accountaction.go index 74ff0851c..290d80b71 100644 --- a/internal/api/client/admin/accountaction.go +++ b/internal/api/client/admin/accountaction.go @@ -22,10 +22,10 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountActionPOSTHandler swagger:operation POST /api/v1/admin/accounts/{id}/action adminAccountAction diff --git a/internal/api/client/admin/accountapprove.go b/internal/api/client/admin/accountapprove.go index 96a495924..f5838f9d9 100644 --- a/internal/api/client/admin/accountapprove.go +++ b/internal/api/client/admin/accountapprove.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountApprovePOSTHandler swagger:operation POST /api/v1/admin/accounts/{id}/approve adminAccountApprove diff --git a/internal/api/client/admin/accountget.go b/internal/api/client/admin/accountget.go index b73f58adb..75659777c 100644 --- a/internal/api/client/admin/accountget.go +++ b/internal/api/client/admin/accountget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountGETHandler swagger:operation GET /api/v1/admin/accounts/{id} adminAccountGet diff --git a/internal/api/client/admin/accountreject.go b/internal/api/client/admin/accountreject.go index fffdc5811..d9651c792 100644 --- a/internal/api/client/admin/accountreject.go +++ b/internal/api/client/admin/accountreject.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AccountRejectPOSTHandler swagger:operation POST /api/v1/admin/accounts/{id}/reject adminAccountReject diff --git a/internal/api/client/admin/accountsgetv1.go b/internal/api/client/admin/accountsgetv1.go index 7d542b97c..3b3b5b783 100644 --- a/internal/api/client/admin/accountsgetv1.go +++ b/internal/api/client/admin/accountsgetv1.go @@ -178,11 +178,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) func (m *Module) AccountsGETV1Handler(c *gin.Context) { diff --git a/internal/api/client/admin/accountsgetv2.go b/internal/api/client/admin/accountsgetv2.go index 8b6d4391d..971ecf9b4 100644 --- a/internal/api/client/admin/accountsgetv2.go +++ b/internal/api/client/admin/accountsgetv2.go @@ -151,11 +151,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) func (m *Module) AccountsGETV2Handler(c *gin.Context) { diff --git a/internal/api/client/admin/accountsgetv2_test.go b/internal/api/client/admin/accountsgetv2_test.go index 2a2c89780..e460f8da6 100644 --- a/internal/api/client/admin/accountsgetv2_test.go +++ b/internal/api/client/admin/accountsgetv2_test.go @@ -25,9 +25,9 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" ) type AccountsGetTestSuite struct { diff --git a/internal/api/client/admin/admin.go b/internal/api/client/admin/admin.go index 01a5796ae..033a1800e 100644 --- a/internal/api/client/admin/admin.go +++ b/internal/api/client/admin/admin.go @@ -20,11 +20,11 @@ package admin import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" "codeberg.org/gruf/go-debug" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" ) const ( diff --git a/internal/api/client/admin/admin_test.go b/internal/api/client/admin/admin_test.go index 55249a1cd..b7d1b01b4 100644 --- a/internal/api/client/admin/admin_test.go +++ b/internal/api/client/admin/admin_test.go @@ -23,21 +23,21 @@ import ( "net/http" "net/http/httptest" + adminactions "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - adminactions "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AdminStandardTestSuite struct { diff --git a/internal/api/client/admin/debug_on.go b/internal/api/client/admin/debug_on.go index eb38e95e5..505875eb2 100644 --- a/internal/api/client/admin/debug_on.go +++ b/internal/api/client/admin/debug_on.go @@ -24,9 +24,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) DebugAPUrlHandler(c *gin.Context) { diff --git a/internal/api/client/admin/domainallowcreate.go b/internal/api/client/admin/domainallowcreate.go index 3e2baa053..d7ccac620 100644 --- a/internal/api/client/admin/domainallowcreate.go +++ b/internal/api/client/admin/domainallowcreate.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainAllowsPOSTHandler swagger:operation POST /api/v1/admin/domain_allows domainAllowCreate diff --git a/internal/api/client/admin/domainallowdelete.go b/internal/api/client/admin/domainallowdelete.go index 20f97fe6d..06e6ea538 100644 --- a/internal/api/client/admin/domainallowdelete.go +++ b/internal/api/client/admin/domainallowdelete.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainAllowDELETEHandler swagger:operation DELETE /api/v1/admin/domain_allows/{id} domainAllowDelete diff --git a/internal/api/client/admin/domainallowget.go b/internal/api/client/admin/domainallowget.go index 6ed845235..61c6dae20 100644 --- a/internal/api/client/admin/domainallowget.go +++ b/internal/api/client/admin/domainallowget.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainAllowGETHandler swagger:operation GET /api/v1/admin/domain_allows/{id} domainAllowGet diff --git a/internal/api/client/admin/domainallowsget.go b/internal/api/client/admin/domainallowsget.go index 4790f1a2b..d973b9df4 100644 --- a/internal/api/client/admin/domainallowsget.go +++ b/internal/api/client/admin/domainallowsget.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainAllowsGETHandler swagger:operation GET /api/v1/admin/domain_allows domainAllowsGet diff --git a/internal/api/client/admin/domainallowupdate.go b/internal/api/client/admin/domainallowupdate.go index 02edfdfef..9b28d4682 100644 --- a/internal/api/client/admin/domainallowupdate.go +++ b/internal/api/client/admin/domainallowupdate.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainAllowUpdatePUTHandler swagger:operation PUT /api/v1/admin/domain_allows/{id} domainAllowUpdate diff --git a/internal/api/client/admin/domainblockcreate.go b/internal/api/client/admin/domainblockcreate.go index 1e98c6f6f..e305d7e5a 100644 --- a/internal/api/client/admin/domainblockcreate.go +++ b/internal/api/client/admin/domainblockcreate.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainBlocksPOSTHandler swagger:operation POST /api/v1/admin/domain_blocks domainBlockCreate diff --git a/internal/api/client/admin/domainblockdelete.go b/internal/api/client/admin/domainblockdelete.go index e9b207505..f7bda40b0 100644 --- a/internal/api/client/admin/domainblockdelete.go +++ b/internal/api/client/admin/domainblockdelete.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainBlockDELETEHandler swagger:operation DELETE /api/v1/admin/domain_blocks/{id} domainBlockDelete diff --git a/internal/api/client/admin/domainblockget.go b/internal/api/client/admin/domainblockget.go index 1d73962fa..23d0795f5 100644 --- a/internal/api/client/admin/domainblockget.go +++ b/internal/api/client/admin/domainblockget.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainBlockGETHandler swagger:operation GET /api/v1/admin/domain_blocks/{id} domainBlockGet diff --git a/internal/api/client/admin/domainblocksget.go b/internal/api/client/admin/domainblocksget.go index 383acbea5..1728fbe3d 100644 --- a/internal/api/client/admin/domainblocksget.go +++ b/internal/api/client/admin/domainblocksget.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainBlocksGETHandler swagger:operation GET /api/v1/admin/domain_blocks domainBlocksGet diff --git a/internal/api/client/admin/domainblockupdate.go b/internal/api/client/admin/domainblockupdate.go index 0fbe72aa8..b3c4408c8 100644 --- a/internal/api/client/admin/domainblockupdate.go +++ b/internal/api/client/admin/domainblockupdate.go @@ -18,8 +18,8 @@ package admin import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainBlockUpdatePUTHandler swagger:operation PUT /api/v1/admin/domain_blocks/{id} domainBlockUpdate diff --git a/internal/api/client/admin/domainkeysexpire.go b/internal/api/client/admin/domainkeysexpire.go index 262d196b4..e18eae126 100644 --- a/internal/api/client/admin/domainkeysexpire.go +++ b/internal/api/client/admin/domainkeysexpire.go @@ -23,11 +23,11 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainKeysExpirePOSTHandler swagger:operation POST /api/v1/admin/domain_keys_expire domainKeysExpire diff --git a/internal/api/client/admin/domainpermission.go b/internal/api/client/admin/domainpermission.go index 91b95334b..0dfbdc804 100644 --- a/internal/api/client/admin/domainpermission.go +++ b/internal/api/client/admin/domainpermission.go @@ -24,12 +24,12 @@ import ( "mime/multipart" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type singleDomainPermCreate func( diff --git a/internal/api/client/admin/domainpermissiondraftaccept.go b/internal/api/client/admin/domainpermissiondraftaccept.go index 345b4d1c3..2514d339c 100644 --- a/internal/api/client/admin/domainpermissiondraftaccept.go +++ b/internal/api/client/admin/domainpermissiondraftaccept.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionDraftAcceptPOSTHandler swagger:operation POST /api/v1/admin/domain_permission_drafts/{id}/accept domainPermissionDraftAccept diff --git a/internal/api/client/admin/domainpermissiondraftcreate.go b/internal/api/client/admin/domainpermissiondraftcreate.go index e7fcd2c40..71aee0c05 100644 --- a/internal/api/client/admin/domainpermissiondraftcreate.go +++ b/internal/api/client/admin/domainpermissiondraftcreate.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // DomainPermissionDraftsPOSTHandler swagger:operation POST /api/v1/admin/domain_permission_drafts domainPermissionDraftCreate diff --git a/internal/api/client/admin/domainpermissiondraftget.go b/internal/api/client/admin/domainpermissiondraftget.go index bff6254f7..8f4aa03bf 100644 --- a/internal/api/client/admin/domainpermissiondraftget.go +++ b/internal/api/client/admin/domainpermissiondraftget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionDraftGETHandler swagger:operation GET /api/v1/admin/domain_permission_drafts/{id} domainPermissionDraftGet diff --git a/internal/api/client/admin/domainpermissiondraftremove.go b/internal/api/client/admin/domainpermissiondraftremove.go index 6346331d1..6cd476b19 100644 --- a/internal/api/client/admin/domainpermissiondraftremove.go +++ b/internal/api/client/admin/domainpermissiondraftremove.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionDraftRemovePOSTHandler swagger:operation POST /api/v1/admin/domain_permission_drafts/{id}/remove domainPermissionDraftRemove diff --git a/internal/api/client/admin/domainpermissiondraftsget.go b/internal/api/client/admin/domainpermissiondraftsget.go index fa5e1ce6a..b54332202 100644 --- a/internal/api/client/admin/domainpermissiondraftsget.go +++ b/internal/api/client/admin/domainpermissiondraftsget.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // DomainPermissionDraftsGETHandler swagger:operation GET /api/v1/admin/domain_permission_drafts domainPermissionDraftsGet diff --git a/internal/api/client/admin/domainpermissionexcludecreate.go b/internal/api/client/admin/domainpermissionexcludecreate.go index 9559ab5b2..1b8dd307b 100644 --- a/internal/api/client/admin/domainpermissionexcludecreate.go +++ b/internal/api/client/admin/domainpermissionexcludecreate.go @@ -22,9 +22,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionExcludesPOSTHandler swagger:operation POST /api/v1/admin/domain_permission_excludes domainPermissionExcludeCreate diff --git a/internal/api/client/admin/domainpermissionexcludeget.go b/internal/api/client/admin/domainpermissionexcludeget.go index 200f20021..18d3ea56e 100644 --- a/internal/api/client/admin/domainpermissionexcludeget.go +++ b/internal/api/client/admin/domainpermissionexcludeget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionExcludeGETHandler swagger:operation GET /api/v1/admin/domain_permission_excludes/{id} domainPermissionExcludeGet diff --git a/internal/api/client/admin/domainpermissionexcluderemove.go b/internal/api/client/admin/domainpermissionexcluderemove.go index 35a4bdd27..c1dc98241 100644 --- a/internal/api/client/admin/domainpermissionexcluderemove.go +++ b/internal/api/client/admin/domainpermissionexcluderemove.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionExcludeDELETEHandler swagger:operation DELETE /api/v1/admin/domain_permission_excludes/{id} domainPermissionExcludeDelete diff --git a/internal/api/client/admin/domainpermissionexcludesget.go b/internal/api/client/admin/domainpermissionexcludesget.go index 59384079c..d245c1666 100644 --- a/internal/api/client/admin/domainpermissionexcludesget.go +++ b/internal/api/client/admin/domainpermissionexcludesget.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // DomainPermissionExcludesGETHandler swagger:operation GET /api/v1/admin/domain_permission_excludes domainPermissionExcludesGet diff --git a/internal/api/client/admin/domainpermissionsubscriptioncreate.go b/internal/api/client/admin/domainpermissionsubscriptioncreate.go index b45ac8d72..f44eda748 100644 --- a/internal/api/client/admin/domainpermissionsubscriptioncreate.go +++ b/internal/api/client/admin/domainpermissionsubscriptioncreate.go @@ -23,11 +23,11 @@ import ( "net/http" "net/url" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // DomainPermissionSubscriptionPOSTHandler swagger:operation POST /api/v1/admin/domain_permission_subscriptions domainPermissionSubscriptionCreate diff --git a/internal/api/client/admin/domainpermissionsubscriptionget.go b/internal/api/client/admin/domainpermissionsubscriptionget.go index 59498beea..43bb90623 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionget.go +++ b/internal/api/client/admin/domainpermissionsubscriptionget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionSubscriptionGETHandler swagger:operation GET /api/v1/admin/domain_permission_subscriptions/{id} domainPermissionSubscriptionGet diff --git a/internal/api/client/admin/domainpermissionsubscriptionremove.go b/internal/api/client/admin/domainpermissionsubscriptionremove.go index c659a7559..f44241d1e 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionremove.go +++ b/internal/api/client/admin/domainpermissionsubscriptionremove.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // DomainPermissionSubscriptionRemovePOSTHandler swagger:operation POST /api/v1/admin/domain_permission_subscriptions/{id}/remove domainPermissionSubscriptionRemove diff --git a/internal/api/client/admin/domainpermissionsubscriptionsget.go b/internal/api/client/admin/domainpermissionsubscriptionsget.go index b3509a139..55f1a8de0 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionsget.go +++ b/internal/api/client/admin/domainpermissionsubscriptionsget.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // DomainPermissionSubscriptionsGETHandler swagger:operation GET /api/v1/admin/domain_permission_subscriptions domainPermissionSubscriptionsGet diff --git a/internal/api/client/admin/domainpermissionsubscriptionspreviewget.go b/internal/api/client/admin/domainpermissionsubscriptionspreviewget.go index d942e9612..193a2ca24 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionspreviewget.go +++ b/internal/api/client/admin/domainpermissionsubscriptionspreviewget.go @@ -22,10 +22,10 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // DomainPermissionSubscriptionsPreviewGETHandler swagger:operation GET /api/v1/admin/domain_permission_subscriptions/preview domainPermissionSubscriptionsPreviewGet diff --git a/internal/api/client/admin/domainpermissionsubscriptiontest.go b/internal/api/client/admin/domainpermissionsubscriptiontest.go index 573f1ca01..cb27312c6 100644 --- a/internal/api/client/admin/domainpermissionsubscriptiontest.go +++ b/internal/api/client/admin/domainpermissionsubscriptiontest.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // DomainPermissionSubscriptionTestPOSTHandler swagger:operation POST /api/v1/admin/domain_permission_subscriptions/{id}/test domainPermissionSubscriptionTest diff --git a/internal/api/client/admin/domainpermissionsubscriptiontest_test.go b/internal/api/client/admin/domainpermissionsubscriptiontest_test.go index 4ac366520..6d3356f0e 100644 --- a/internal/api/client/admin/domainpermissionsubscriptiontest_test.go +++ b/internal/api/client/admin/domainpermissionsubscriptiontest_test.go @@ -27,12 +27,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type DomainPermissionSubscriptionTestTestSuite struct { diff --git a/internal/api/client/admin/domainpermissionsubscriptionupdate.go b/internal/api/client/admin/domainpermissionsubscriptionupdate.go index 0f6309c19..364e75f80 100644 --- a/internal/api/client/admin/domainpermissionsubscriptionupdate.go +++ b/internal/api/client/admin/domainpermissionsubscriptionupdate.go @@ -23,12 +23,12 @@ import ( "net/http" "net/url" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // DomainPermissionSubscriptionPATCHHandler swagger:operation PATCH /api/v1/admin/domain_permission_subscriptions/${id} domainPermissionSubscriptionUpdate diff --git a/internal/api/client/admin/emailtest.go b/internal/api/client/admin/emailtest.go index 37a5e31d3..bd5d12dc6 100644 --- a/internal/api/client/admin/emailtest.go +++ b/internal/api/client/admin/emailtest.go @@ -22,10 +22,10 @@ import ( "net/http" "net/mail" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmailTestPostHandler swagger:operation POST /api/v1/admin/email/test testEmailSend diff --git a/internal/api/client/admin/emojicategoriesget.go b/internal/api/client/admin/emojicategoriesget.go index e678cea86..37d6f12f3 100644 --- a/internal/api/client/admin/emojicategoriesget.go +++ b/internal/api/client/admin/emojicategoriesget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmojiCategoriesGETHandler swagger:operation GET /api/v1/admin/custom_emojis/categories emojiCategoriesGet diff --git a/internal/api/client/admin/emojicategoriesget_test.go b/internal/api/client/admin/emojicategoriesget_test.go index bca178bde..6c0f9e80f 100644 --- a/internal/api/client/admin/emojicategoriesget_test.go +++ b/internal/api/client/admin/emojicategoriesget_test.go @@ -25,8 +25,8 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" ) type EmojiCategoriesGetTestSuite struct { diff --git a/internal/api/client/admin/emojicreate.go b/internal/api/client/admin/emojicreate.go index 445c56605..c2723042a 100644 --- a/internal/api/client/admin/emojicreate.go +++ b/internal/api/client/admin/emojicreate.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // EmojiCreatePOSTHandler swagger:operation POST /api/v1/admin/custom_emojis emojiCreate diff --git a/internal/api/client/admin/emojicreate_test.go b/internal/api/client/admin/emojicreate_test.go index 9e985459b..1a6983c21 100644 --- a/internal/api/client/admin/emojicreate_test.go +++ b/internal/api/client/admin/emojicreate_test.go @@ -25,10 +25,10 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmojiCreateTestSuite struct { diff --git a/internal/api/client/admin/emojidelete.go b/internal/api/client/admin/emojidelete.go index 05d94f25d..7809608e3 100644 --- a/internal/api/client/admin/emojidelete.go +++ b/internal/api/client/admin/emojidelete.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmojiDELETEHandler swagger:operation DELETE /api/v1/admin/custom_emojis/{id} emojiDelete diff --git a/internal/api/client/admin/emojidelete_test.go b/internal/api/client/admin/emojidelete_test.go index 88e929b55..c327bed94 100644 --- a/internal/api/client/admin/emojidelete_test.go +++ b/internal/api/client/admin/emojidelete_test.go @@ -26,10 +26,10 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" ) type EmojiDeleteTestSuite struct { diff --git a/internal/api/client/admin/emojiget.go b/internal/api/client/admin/emojiget.go index 41bea00f8..5abed2aaa 100644 --- a/internal/api/client/admin/emojiget.go +++ b/internal/api/client/admin/emojiget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmojiGETHandler swagger:operation GET /api/v1/admin/custom_emojis/{id} emojiGet diff --git a/internal/api/client/admin/emojiget_test.go b/internal/api/client/admin/emojiget_test.go index d6b2924ab..97e32f412 100644 --- a/internal/api/client/admin/emojiget_test.go +++ b/internal/api/client/admin/emojiget_test.go @@ -25,9 +25,9 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) type EmojiGetTestSuite struct { diff --git a/internal/api/client/admin/emojisget.go b/internal/api/client/admin/emojisget.go index c1d05af07..d9cf508ce 100644 --- a/internal/api/client/admin/emojisget.go +++ b/internal/api/client/admin/emojisget.go @@ -22,11 +22,11 @@ import ( "net/http" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmojisGETHandler swagger:operation GET /api/v1/admin/custom_emojis emojisGet diff --git a/internal/api/client/admin/emojisget_test.go b/internal/api/client/admin/emojisget_test.go index 85156c79a..a7fd78b20 100644 --- a/internal/api/client/admin/emojisget_test.go +++ b/internal/api/client/admin/emojisget_test.go @@ -24,9 +24,9 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" ) type EmojisGetTestSuite struct { diff --git a/internal/api/client/admin/emojiupdate.go b/internal/api/client/admin/emojiupdate.go index 07337eaa9..807f24844 100644 --- a/internal/api/client/admin/emojiupdate.go +++ b/internal/api/client/admin/emojiupdate.go @@ -23,12 +23,12 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // EmojiPATCHHandler swagger:operation PATCH /api/v1/admin/custom_emojis/{id} emojiUpdate diff --git a/internal/api/client/admin/emojiupdate_test.go b/internal/api/client/admin/emojiupdate_test.go index b6dffa887..91a9ec8f4 100644 --- a/internal/api/client/admin/emojiupdate_test.go +++ b/internal/api/client/admin/emojiupdate_test.go @@ -26,12 +26,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmojiUpdateTestSuite struct { diff --git a/internal/api/client/admin/headerfilter.go b/internal/api/client/admin/headerfilter.go index b101e98f6..75bf29b68 100644 --- a/internal/api/client/admin/headerfilter.go +++ b/internal/api/client/admin/headerfilter.go @@ -22,11 +22,11 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // getHeaderFilter is a gin handler function that returns details of an HTTP header filter with provided ID, using given get function. diff --git a/internal/api/client/admin/mediacleanup.go b/internal/api/client/admin/mediacleanup.go index 2554f8508..56610ce3e 100644 --- a/internal/api/client/admin/mediacleanup.go +++ b/internal/api/client/admin/mediacleanup.go @@ -21,11 +21,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // MediaCleanupPOSTHandler swagger:operation POST /api/v1/admin/media_cleanup mediaCleanup diff --git a/internal/api/client/admin/mediacleanup_test.go b/internal/api/client/admin/mediacleanup_test.go index ca3431b33..8224b875f 100644 --- a/internal/api/client/admin/mediacleanup_test.go +++ b/internal/api/client/admin/mediacleanup_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaCleanupTestSuite struct { diff --git a/internal/api/client/admin/mediarefetch.go b/internal/api/client/admin/mediarefetch.go index 47301460f..bf32ad207 100644 --- a/internal/api/client/admin/mediarefetch.go +++ b/internal/api/client/admin/mediarefetch.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // MediaRefetchPOSTHandler swagger:operation POST /api/v1/admin/media_refetch mediaRefetch diff --git a/internal/api/client/admin/reportget.go b/internal/api/client/admin/reportget.go index 163043627..6f870303a 100644 --- a/internal/api/client/admin/reportget.go +++ b/internal/api/client/admin/reportget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ReportGETHandler swagger:operation GET /api/v1/admin/reports/{id} adminReportGet diff --git a/internal/api/client/admin/reportresolve.go b/internal/api/client/admin/reportresolve.go index 2b9be3721..df9e749a6 100644 --- a/internal/api/client/admin/reportresolve.go +++ b/internal/api/client/admin/reportresolve.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ReportResolvePOSTHandler swagger:operation POST /api/v1/admin/reports/{id}/resolve adminReportResolve diff --git a/internal/api/client/admin/reportresolve_test.go b/internal/api/client/admin/reportresolve_test.go index 561661fe0..e808b533d 100644 --- a/internal/api/client/admin/reportresolve_test.go +++ b/internal/api/client/admin/reportresolve_test.go @@ -26,16 +26,16 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportResolveTestSuite struct { diff --git a/internal/api/client/admin/reportsget.go b/internal/api/client/admin/reportsget.go index 64a144767..31c93cbcc 100644 --- a/internal/api/client/admin/reportsget.go +++ b/internal/api/client/admin/reportsget.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // ReportsGETHandler swagger:operation GET /api/v1/admin/reports adminReports diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go index ec15b05d3..8489d5c28 100644 --- a/internal/api/client/admin/reportsget_test.go +++ b/internal/api/client/admin/reportsget_test.go @@ -25,16 +25,16 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportsGetTestSuite struct { diff --git a/internal/api/client/admin/rulecreate.go b/internal/api/client/admin/rulecreate.go index 9e4be1da3..ac8febaed 100644 --- a/internal/api/client/admin/rulecreate.go +++ b/internal/api/client/admin/rulecreate.go @@ -22,10 +22,10 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // RulePOSTHandler swagger:operation POST /api/v1/admin/instance/rules ruleCreate diff --git a/internal/api/client/admin/ruledelete.go b/internal/api/client/admin/ruledelete.go index c2797aa8d..b6415cf3b 100644 --- a/internal/api/client/admin/ruledelete.go +++ b/internal/api/client/admin/ruledelete.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // RuleDELETEHandler swagger:operation DELETE /api/v1/admin/instance/rules/{id} ruleDelete diff --git a/internal/api/client/admin/ruleget.go b/internal/api/client/admin/ruleget.go index ce627a0d7..ce21bbb26 100644 --- a/internal/api/client/admin/ruleget.go +++ b/internal/api/client/admin/ruleget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // RuleGETHandler swagger:operation GET /api/v1/admin/instance/rules/{id} adminRuleGet diff --git a/internal/api/client/admin/rulesget.go b/internal/api/client/admin/rulesget.go index bc4961c6a..48cd4b43c 100644 --- a/internal/api/client/admin/rulesget.go +++ b/internal/api/client/admin/rulesget.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // RulesGETHandler swagger:operation GET /api/v1/admin/instance/rules adminsRuleGet diff --git a/internal/api/client/admin/ruleupdate.go b/internal/api/client/admin/ruleupdate.go index db8b610e0..8f2efe845 100644 --- a/internal/api/client/admin/ruleupdate.go +++ b/internal/api/client/admin/ruleupdate.go @@ -21,10 +21,10 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // RulePATCHHandler swagger:operation PATCH /api/v1/admin/instance/rules/{id} ruleUpdate diff --git a/internal/api/client/announcements/announcements.go b/internal/api/client/announcements/announcements.go index 611a1c53e..85a1f2eb2 100644 --- a/internal/api/client/announcements/announcements.go +++ b/internal/api/client/announcements/announcements.go @@ -20,8 +20,8 @@ package announcements import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) // BasePath is the base path for this api module, excluding the api prefix diff --git a/internal/api/client/announcements/announcementsget.go b/internal/api/client/announcements/announcementsget.go index 92353a4e7..90347c177 100644 --- a/internal/api/client/announcements/announcementsget.go +++ b/internal/api/client/announcements/announcementsget.go @@ -20,9 +20,9 @@ package announcements import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AnnouncementsGETHandler swagger:operation GET /api/v1/announcements announcementsGet diff --git a/internal/api/client/apps/appcreate.go b/internal/api/client/apps/appcreate.go index 062b2e13d..11784bf63 100644 --- a/internal/api/client/apps/appcreate.go +++ b/internal/api/client/apps/appcreate.go @@ -24,10 +24,10 @@ import ( "slices" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // these consts are used to ensure users can't spam huge entries into our database diff --git a/internal/api/client/apps/appdelete.go b/internal/api/client/apps/appdelete.go index 301579929..db3b31d5c 100644 --- a/internal/api/client/apps/appdelete.go +++ b/internal/api/client/apps/appdelete.go @@ -20,9 +20,9 @@ package apps import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AppDELETEHandler swagger:operation DELETE /api/v1/apps/{id} appDelete diff --git a/internal/api/client/apps/appget.go b/internal/api/client/apps/appget.go index f9d5050b4..fc16c5ae1 100644 --- a/internal/api/client/apps/appget.go +++ b/internal/api/client/apps/appget.go @@ -20,9 +20,9 @@ package apps import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // AppGETHandler swagger:operation GET /api/v1/apps/{id} appGet diff --git a/internal/api/client/apps/apps.go b/internal/api/client/apps/apps.go index 2071c08bd..ae1be030f 100644 --- a/internal/api/client/apps/apps.go +++ b/internal/api/client/apps/apps.go @@ -20,9 +20,9 @@ package apps import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/apps/appsget.go b/internal/api/client/apps/appsget.go index 6bbd4c752..31b2e9337 100644 --- a/internal/api/client/apps/appsget.go +++ b/internal/api/client/apps/appsget.go @@ -20,10 +20,10 @@ package apps import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // AppsGETHandler swagger:operation GET /api/v1/apps appsGet diff --git a/internal/api/client/blocks/blocks.go b/internal/api/client/blocks/blocks.go index 0eeee2bf1..2af1e7871 100644 --- a/internal/api/client/blocks/blocks.go +++ b/internal/api/client/blocks/blocks.go @@ -20,8 +20,8 @@ package blocks import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/blocks/blocksget.go b/internal/api/client/blocks/blocksget.go index 0d9a2234e..45a24cf91 100644 --- a/internal/api/client/blocks/blocksget.go +++ b/internal/api/client/blocks/blocksget.go @@ -20,10 +20,10 @@ package blocks import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // BlocksGETHandler swagger:operation GET /api/v1/blocks blocksGet diff --git a/internal/api/client/bookmarks/bookmarks.go b/internal/api/client/bookmarks/bookmarks.go index 3f4df9011..dbc27787e 100644 --- a/internal/api/client/bookmarks/bookmarks.go +++ b/internal/api/client/bookmarks/bookmarks.go @@ -20,8 +20,8 @@ package bookmarks import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/bookmarks/bookmarks_test.go b/internal/api/client/bookmarks/bookmarks_test.go index 7cb22d34e..9210d6f1c 100644 --- a/internal/api/client/bookmarks/bookmarks_test.go +++ b/internal/api/client/bookmarks/bookmarks_test.go @@ -27,23 +27,23 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/bookmarks" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/bookmarks" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type BookmarkTestSuite struct { diff --git a/internal/api/client/bookmarks/bookmarksget.go b/internal/api/client/bookmarks/bookmarksget.go index 6fa87c688..beaec63f3 100644 --- a/internal/api/client/bookmarks/bookmarksget.go +++ b/internal/api/client/bookmarks/bookmarksget.go @@ -22,9 +22,9 @@ import ( "net/http" "strconv" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const ( diff --git a/internal/api/client/conversations/conversationdelete.go b/internal/api/client/conversations/conversationdelete.go index dabb2bfc8..6757ffe1a 100644 --- a/internal/api/client/conversations/conversationdelete.go +++ b/internal/api/client/conversations/conversationdelete.go @@ -20,9 +20,9 @@ package conversations import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ConversationDELETEHandler swagger:operation DELETE /api/v1/conversations/{id} conversationDelete diff --git a/internal/api/client/conversations/conversationread.go b/internal/api/client/conversations/conversationread.go index e168cca2e..0eb907ca4 100644 --- a/internal/api/client/conversations/conversationread.go +++ b/internal/api/client/conversations/conversationread.go @@ -20,9 +20,9 @@ package conversations import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ConversationReadPOSTHandler swagger:operation POST /api/v1/conversation/{id}/read conversationRead diff --git a/internal/api/client/conversations/conversations.go b/internal/api/client/conversations/conversations.go index e742c8d3d..2cfb6ea65 100644 --- a/internal/api/client/conversations/conversations.go +++ b/internal/api/client/conversations/conversations.go @@ -20,9 +20,9 @@ package conversations import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/conversations/conversationsget.go b/internal/api/client/conversations/conversationsget.go index 8cd70cd00..c9edd0825 100644 --- a/internal/api/client/conversations/conversationsget.go +++ b/internal/api/client/conversations/conversationsget.go @@ -20,10 +20,10 @@ package conversations import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // ConversationsGETHandler swagger:operation GET /api/v1/conversations conversationsGet diff --git a/internal/api/client/customemojis/customemojis.go b/internal/api/client/customemojis/customemojis.go index 69154e186..1a7a996d6 100644 --- a/internal/api/client/customemojis/customemojis.go +++ b/internal/api/client/customemojis/customemojis.go @@ -20,8 +20,8 @@ package customemojis import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/customemojis/customemojisget.go b/internal/api/client/customemojis/customemojisget.go index 7c9b88b4c..c63445aef 100644 --- a/internal/api/client/customemojis/customemojisget.go +++ b/internal/api/client/customemojis/customemojisget.go @@ -20,9 +20,9 @@ package customemojis import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // CustomEmojisGETHandler swagger:operation GET /api/v1/custom_emojis customEmojisGet diff --git a/internal/api/client/exports/blocks.go b/internal/api/client/exports/blocks.go index bc8c2a6b3..fae8a201b 100644 --- a/internal/api/client/exports/blocks.go +++ b/internal/api/client/exports/blocks.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportBlocksGETHandler swagger:operation GET /api/v1/exports/blocks.csv exportBlocks diff --git a/internal/api/client/exports/exports.go b/internal/api/client/exports/exports.go index 90a246a74..a770e9a32 100644 --- a/internal/api/client/exports/exports.go +++ b/internal/api/client/exports/exports.go @@ -20,8 +20,8 @@ package exports import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/exports/exports_test.go b/internal/api/client/exports/exports_test.go index 60d428d78..8428b736f 100644 --- a/internal/api/client/exports/exports_test.go +++ b/internal/api/client/exports/exports_test.go @@ -25,14 +25,14 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/exports" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/exports" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ExportsTestSuite struct { diff --git a/internal/api/client/exports/followers.go b/internal/api/client/exports/followers.go index ad6306de0..520fbef70 100644 --- a/internal/api/client/exports/followers.go +++ b/internal/api/client/exports/followers.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportFollowersGETHandler swagger:operation GET /api/v1/exports/followers.csv exportFollowers diff --git a/internal/api/client/exports/following.go b/internal/api/client/exports/following.go index b95492dfa..8d6306092 100644 --- a/internal/api/client/exports/following.go +++ b/internal/api/client/exports/following.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportFollowingGETHandler swagger:operation GET /api/v1/exports/following.csv exportFollowing diff --git a/internal/api/client/exports/lists.go b/internal/api/client/exports/lists.go index 385df5501..cf152bf55 100644 --- a/internal/api/client/exports/lists.go +++ b/internal/api/client/exports/lists.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportListsGETHandler swagger:operation GET /api/v1/exports/lists.csv exportLists diff --git a/internal/api/client/exports/mutes.go b/internal/api/client/exports/mutes.go index 6b9d699c9..0db94db62 100644 --- a/internal/api/client/exports/mutes.go +++ b/internal/api/client/exports/mutes.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportMutesGETHandler swagger:operation GET /api/v1/exports/mutes.csv exportMutes diff --git a/internal/api/client/exports/stats.go b/internal/api/client/exports/stats.go index 783826bb3..6b9436065 100644 --- a/internal/api/client/exports/stats.go +++ b/internal/api/client/exports/stats.go @@ -20,9 +20,9 @@ package exports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ExportStatsGETHandler swagger:operation GET /api/v1/exports/stats exportStats diff --git a/internal/api/client/favourites/favourites.go b/internal/api/client/favourites/favourites.go index 6e2d39100..c72e20b98 100644 --- a/internal/api/client/favourites/favourites.go +++ b/internal/api/client/favourites/favourites.go @@ -20,8 +20,8 @@ package favourites import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/favourites/favourites_test.go b/internal/api/client/favourites/favourites_test.go index a141b4aa1..5f0374a4d 100644 --- a/internal/api/client/favourites/favourites_test.go +++ b/internal/api/client/favourites/favourites_test.go @@ -18,19 +18,19 @@ package favourites_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/favourites" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/favourites" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FavouritesStandardTestSuite struct { diff --git a/internal/api/client/favourites/favouritesget.go b/internal/api/client/favourites/favouritesget.go index 5396bc155..8b1f646c4 100644 --- a/internal/api/client/favourites/favouritesget.go +++ b/internal/api/client/favourites/favouritesget.go @@ -22,9 +22,9 @@ import ( "net/http" "strconv" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FavouritesGETHandler swagger:operation GET /api/v1/favourites favouritesGet diff --git a/internal/api/client/favourites/favouritesget_test.go b/internal/api/client/favourites/favouritesget_test.go index 85a669c87..f2695b6d0 100644 --- a/internal/api/client/favourites/favouritesget_test.go +++ b/internal/api/client/favourites/favouritesget_test.go @@ -25,12 +25,12 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/favourites" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/favourites" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FavouritesTestSuite struct { diff --git a/internal/api/client/featuredtags/featuredtags.go b/internal/api/client/featuredtags/featuredtags.go index f5961883d..3885da3f8 100644 --- a/internal/api/client/featuredtags/featuredtags.go +++ b/internal/api/client/featuredtags/featuredtags.go @@ -20,8 +20,8 @@ package featuredtags import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/featuredtags/get.go b/internal/api/client/featuredtags/get.go index cab6b19a3..7b5c68e40 100644 --- a/internal/api/client/featuredtags/get.go +++ b/internal/api/client/featuredtags/get.go @@ -20,9 +20,9 @@ package featuredtags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FeaturedTagsGETHandler swagger:operation GET /api/v1/featured_tags getFeaturedTags diff --git a/internal/api/client/filters/v1/filter.go b/internal/api/client/filters/v1/filter.go index 9daeb75d3..af5652d7c 100644 --- a/internal/api/client/filters/v1/filter.go +++ b/internal/api/client/filters/v1/filter.go @@ -18,10 +18,11 @@ package v1 import ( - "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" "net/http" + + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "github.com/gin-gonic/gin" ) const ( diff --git a/internal/api/client/filters/v1/filter_test.go b/internal/api/client/filters/v1/filter_test.go index ca3827e3c..df182493e 100644 --- a/internal/api/client/filters/v1/filter_test.go +++ b/internal/api/client/filters/v1/filter_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FiltersTestSuite struct { diff --git a/internal/api/client/filters/v1/filterdelete.go b/internal/api/client/filters/v1/filterdelete.go index e28221ca6..5283240c5 100644 --- a/internal/api/client/filters/v1/filterdelete.go +++ b/internal/api/client/filters/v1/filterdelete.go @@ -20,9 +20,9 @@ package v1 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterDELETEHandler swagger:operation DELETE /api/v1/filters/{id} filterV1Delete diff --git a/internal/api/client/filters/v1/filterdelete_test.go b/internal/api/client/filters/v1/filterdelete_test.go index 8d7b3d063..314da05bd 100644 --- a/internal/api/client/filters/v1/filterdelete_test.go +++ b/internal/api/client/filters/v1/filterdelete_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) deleteFilter( diff --git a/internal/api/client/filters/v1/filterget.go b/internal/api/client/filters/v1/filterget.go index 4af3dab16..704be540a 100644 --- a/internal/api/client/filters/v1/filterget.go +++ b/internal/api/client/filters/v1/filterget.go @@ -20,9 +20,9 @@ package v1 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterGETHandler swagger:operation GET /api/v1/filters/{id} filterV1Get diff --git a/internal/api/client/filters/v1/filterget_test.go b/internal/api/client/filters/v1/filterget_test.go index e8fdedfaa..93090c880 100644 --- a/internal/api/client/filters/v1/filterget_test.go +++ b/internal/api/client/filters/v1/filterget_test.go @@ -23,13 +23,13 @@ import ( "net/http" "net/http/httptest" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilter( diff --git a/internal/api/client/filters/v1/filterpost.go b/internal/api/client/filters/v1/filterpost.go index fb53b8e9b..d61ddbdb8 100644 --- a/internal/api/client/filters/v1/filterpost.go +++ b/internal/api/client/filters/v1/filterpost.go @@ -20,10 +20,10 @@ package v1 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterPOSTHandler swagger:operation POST /api/v1/filters filterV1Post diff --git a/internal/api/client/filters/v1/filterpost_test.go b/internal/api/client/filters/v1/filterpost_test.go index b7aecc573..1731aed8f 100644 --- a/internal/api/client/filters/v1/filterpost_test.go +++ b/internal/api/client/filters/v1/filterpost_test.go @@ -26,13 +26,13 @@ import ( "strconv" "strings" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) postFilter( diff --git a/internal/api/client/filters/v1/filterput.go b/internal/api/client/filters/v1/filterput.go index 051fa1f63..ab08f0d92 100644 --- a/internal/api/client/filters/v1/filterput.go +++ b/internal/api/client/filters/v1/filterput.go @@ -20,10 +20,10 @@ package v1 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterPUTHandler swagger:operation PUT /api/v1/filters/{id} filterV1Put diff --git a/internal/api/client/filters/v1/filterput_test.go b/internal/api/client/filters/v1/filterput_test.go index 626bd52eb..740170a04 100644 --- a/internal/api/client/filters/v1/filterput_test.go +++ b/internal/api/client/filters/v1/filterput_test.go @@ -26,13 +26,13 @@ import ( "strconv" "strings" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) putFilter( diff --git a/internal/api/client/filters/v1/filtersget.go b/internal/api/client/filters/v1/filtersget.go index d65776331..42a7c3b7e 100644 --- a/internal/api/client/filters/v1/filtersget.go +++ b/internal/api/client/filters/v1/filtersget.go @@ -20,9 +20,9 @@ package v1 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FiltersGETHandler swagger:operation GET /api/v1/filters filtersV1Get diff --git a/internal/api/client/filters/v1/filtersget_test.go b/internal/api/client/filters/v1/filtersget_test.go index 281ee4f63..bf8ed8a0b 100644 --- a/internal/api/client/filters/v1/filtersget_test.go +++ b/internal/api/client/filters/v1/filtersget_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV1 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v1" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV1 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v1" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilters( diff --git a/internal/api/client/filters/v1/validate.go b/internal/api/client/filters/v1/validate.go index 9e31abb89..84771d6a8 100644 --- a/internal/api/client/filters/v1/validate.go +++ b/internal/api/client/filters/v1/validate.go @@ -20,10 +20,10 @@ package v1 import ( "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" ) func validateNormalizeCreateUpdateFilter(form *apimodel.FilterCreateUpdateRequestV1) error { diff --git a/internal/api/client/filters/v2/filter.go b/internal/api/client/filters/v2/filter.go index 58e7905ae..e37c2d7e3 100644 --- a/internal/api/client/filters/v2/filter.go +++ b/internal/api/client/filters/v2/filter.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/filters/v2/filter_test.go b/internal/api/client/filters/v2/filter_test.go index 5c8fdf4ae..038205460 100644 --- a/internal/api/client/filters/v2/filter_test.go +++ b/internal/api/client/filters/v2/filter_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FiltersTestSuite struct { diff --git a/internal/api/client/filters/v2/filterdelete.go b/internal/api/client/filters/v2/filterdelete.go index 2fd411e98..4ede393de 100644 --- a/internal/api/client/filters/v2/filterdelete.go +++ b/internal/api/client/filters/v2/filterdelete.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterDELETEHandler swagger:operation DELETE /api/v2/filters/{id} filterV2Delete diff --git a/internal/api/client/filters/v2/filterdelete_test.go b/internal/api/client/filters/v2/filterdelete_test.go index 6ef2f00c9..b2d6ae6de 100644 --- a/internal/api/client/filters/v2/filterdelete_test.go +++ b/internal/api/client/filters/v2/filterdelete_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) deleteFilter( diff --git a/internal/api/client/filters/v2/filterget.go b/internal/api/client/filters/v2/filterget.go index eed65f39a..21ac6a2ca 100644 --- a/internal/api/client/filters/v2/filterget.go +++ b/internal/api/client/filters/v2/filterget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterGETHandler swagger:operation GET /api/v2/filters/{id} filterV2Get diff --git a/internal/api/client/filters/v2/filterget_test.go b/internal/api/client/filters/v2/filterget_test.go index 256732132..48d90cae2 100644 --- a/internal/api/client/filters/v2/filterget_test.go +++ b/internal/api/client/filters/v2/filterget_test.go @@ -23,13 +23,13 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilter( diff --git a/internal/api/client/filters/v2/filterkeyworddelete.go b/internal/api/client/filters/v2/filterkeyworddelete.go index 4dc8b5973..63c235d16 100644 --- a/internal/api/client/filters/v2/filterkeyworddelete.go +++ b/internal/api/client/filters/v2/filterkeyworddelete.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterKeywordDELETEHandler swagger:operation DELETE /api/v2/filters/keywords/{id} filterKeywordDelete diff --git a/internal/api/client/filters/v2/filterkeyworddelete_test.go b/internal/api/client/filters/v2/filterkeyworddelete_test.go index 6f5f07ef4..1b9325c6a 100644 --- a/internal/api/client/filters/v2/filterkeyworddelete_test.go +++ b/internal/api/client/filters/v2/filterkeyworddelete_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) deleteFilterKeyword( diff --git a/internal/api/client/filters/v2/filterkeywordget.go b/internal/api/client/filters/v2/filterkeywordget.go index f298d1af0..e8e4dec0c 100644 --- a/internal/api/client/filters/v2/filterkeywordget.go +++ b/internal/api/client/filters/v2/filterkeywordget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterKeywordGETHandler swagger:operation GET /api/v2/filters/keywords/{id} filterKeywordGet diff --git a/internal/api/client/filters/v2/filterkeywordget_test.go b/internal/api/client/filters/v2/filterkeywordget_test.go index 13e90c0c2..25167700d 100644 --- a/internal/api/client/filters/v2/filterkeywordget_test.go +++ b/internal/api/client/filters/v2/filterkeywordget_test.go @@ -23,13 +23,13 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilterKeyword( diff --git a/internal/api/client/filters/v2/filterkeywordpost.go b/internal/api/client/filters/v2/filterkeywordpost.go index f7ccc1a80..1068f78f8 100644 --- a/internal/api/client/filters/v2/filterkeywordpost.go +++ b/internal/api/client/filters/v2/filterkeywordpost.go @@ -20,12 +20,12 @@ package v2 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // FilterKeywordPOSTHandler swagger:operation POST /api/v2/filters/{id}/keywords filterKeywordPost diff --git a/internal/api/client/filters/v2/filterkeywordpost_test.go b/internal/api/client/filters/v2/filterkeywordpost_test.go index 179cd610a..ce7087b0b 100644 --- a/internal/api/client/filters/v2/filterkeywordpost_test.go +++ b/internal/api/client/filters/v2/filterkeywordpost_test.go @@ -26,13 +26,13 @@ import ( "strconv" "strings" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) postFilterKeyword( diff --git a/internal/api/client/filters/v2/filterkeywordput.go b/internal/api/client/filters/v2/filterkeywordput.go index 5f9fa3c9e..dae3a0042 100644 --- a/internal/api/client/filters/v2/filterkeywordput.go +++ b/internal/api/client/filters/v2/filterkeywordput.go @@ -20,10 +20,10 @@ package v2 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterKeywordPUTHandler swagger:operation PUT /api/v2/filters/keywords{id} filterKeywordPut diff --git a/internal/api/client/filters/v2/filterkeywordput_test.go b/internal/api/client/filters/v2/filterkeywordput_test.go index c90d2e1f6..e98dd899d 100644 --- a/internal/api/client/filters/v2/filterkeywordput_test.go +++ b/internal/api/client/filters/v2/filterkeywordput_test.go @@ -26,13 +26,13 @@ import ( "strconv" "strings" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) putFilterKeyword( diff --git a/internal/api/client/filters/v2/filterkeywordsget.go b/internal/api/client/filters/v2/filterkeywordsget.go index 2fa3140a9..3bfe81bc6 100644 --- a/internal/api/client/filters/v2/filterkeywordsget.go +++ b/internal/api/client/filters/v2/filterkeywordsget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterKeywordsGETHandler swagger:operation GET /api/v2/filters/{id}/keywords filterKeywordsGet diff --git a/internal/api/client/filters/v2/filterkeywordsget_test.go b/internal/api/client/filters/v2/filterkeywordsget_test.go index 0b0b69e03..a67e5be10 100644 --- a/internal/api/client/filters/v2/filterkeywordsget_test.go +++ b/internal/api/client/filters/v2/filterkeywordsget_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilterKeywords( diff --git a/internal/api/client/filters/v2/filterpost.go b/internal/api/client/filters/v2/filterpost.go index b35938692..c2473557a 100644 --- a/internal/api/client/filters/v2/filterpost.go +++ b/internal/api/client/filters/v2/filterpost.go @@ -20,12 +20,12 @@ package v2 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // FilterPOSTHandler swagger:operation POST /api/v2/filters filterV2Post diff --git a/internal/api/client/filters/v2/filterpost_test.go b/internal/api/client/filters/v2/filterpost_test.go index 7a79f4665..40a46a2f6 100644 --- a/internal/api/client/filters/v2/filterpost_test.go +++ b/internal/api/client/filters/v2/filterpost_test.go @@ -27,13 +27,13 @@ import ( "strconv" "strings" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) postFilter(title *string, context *[]string, action *string, expiresIn *int, expiresInStr *string, keywordsAttributesWholeWord *[]bool, statusesAttributesStatusID *[]string, requestJson *string, expectedHTTPStatus int, expectedBody string, keywordsAttributesKeyword *[]string) (*apimodel.FilterV2, error) { diff --git a/internal/api/client/filters/v2/filterput.go b/internal/api/client/filters/v2/filterput.go index b4b14e6c3..689c47e5b 100644 --- a/internal/api/client/filters/v2/filterput.go +++ b/internal/api/client/filters/v2/filterput.go @@ -21,12 +21,12 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // FilterPUTHandler swagger:operation PUT /api/v2/filters/{id} filterV2Put diff --git a/internal/api/client/filters/v2/filterput_test.go b/internal/api/client/filters/v2/filterput_test.go index afa858ba9..9ff4dbfad 100644 --- a/internal/api/client/filters/v2/filterput_test.go +++ b/internal/api/client/filters/v2/filterput_test.go @@ -27,13 +27,13 @@ import ( "strconv" "strings" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) putFilter(filterID string, title *string, context *[]string, action *string, expiresIn *int, expiresInStr *string, keywordsAttributesKeyword *[]string, keywordsAttributesWholeWord *[]bool, keywordsAttributesDestroy *[]bool, statusesAttributesID *[]string, statusesAttributesStatusID *[]string, statusesAttributesDestroy *[]bool, requestJson *string, expectedHTTPStatus int, expectedBody string, keywordsAttributesID *[]string) (*apimodel.FilterV2, error) { diff --git a/internal/api/client/filters/v2/filtersget.go b/internal/api/client/filters/v2/filtersget.go index f304ffea5..94e1db03b 100644 --- a/internal/api/client/filters/v2/filtersget.go +++ b/internal/api/client/filters/v2/filtersget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FiltersGETHandler swagger:operation GET /api/v2/filters filtersV2Get diff --git a/internal/api/client/filters/v2/filtersget_test.go b/internal/api/client/filters/v2/filtersget_test.go index b77df42a6..76802d83a 100644 --- a/internal/api/client/filters/v2/filtersget_test.go +++ b/internal/api/client/filters/v2/filtersget_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilters( diff --git a/internal/api/client/filters/v2/filterstatusdelete.go b/internal/api/client/filters/v2/filterstatusdelete.go index 2adc48190..8522fde06 100644 --- a/internal/api/client/filters/v2/filterstatusdelete.go +++ b/internal/api/client/filters/v2/filterstatusdelete.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterStatusDELETEHandler swagger:operation DELETE /api/v2/filters/statuses/{id} filterStatusDelete diff --git a/internal/api/client/filters/v2/filterstatusdelete_test.go b/internal/api/client/filters/v2/filterstatusdelete_test.go index fd2a5cbdb..017b2739b 100644 --- a/internal/api/client/filters/v2/filterstatusdelete_test.go +++ b/internal/api/client/filters/v2/filterstatusdelete_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) deleteFilterStatus( diff --git a/internal/api/client/filters/v2/filterstatusesget.go b/internal/api/client/filters/v2/filterstatusesget.go index ae76e814f..31616bd36 100644 --- a/internal/api/client/filters/v2/filterstatusesget.go +++ b/internal/api/client/filters/v2/filterstatusesget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterStatusesGETHandler swagger:operation GET /api/v2/filters/{id}/statuses filterStatusesGet diff --git a/internal/api/client/filters/v2/filterstatusesget_test.go b/internal/api/client/filters/v2/filterstatusesget_test.go index 6b8262f26..ba728e2bc 100644 --- a/internal/api/client/filters/v2/filterstatusesget_test.go +++ b/internal/api/client/filters/v2/filterstatusesget_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilterStatuses( diff --git a/internal/api/client/filters/v2/filterstatusget.go b/internal/api/client/filters/v2/filterstatusget.go index efe20f0c2..3add79c26 100644 --- a/internal/api/client/filters/v2/filterstatusget.go +++ b/internal/api/client/filters/v2/filterstatusget.go @@ -20,9 +20,9 @@ package v2 import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FilterStatusGETHandler swagger:operation GET /api/v2/filters/statuses/{id} filterStatusGet diff --git a/internal/api/client/filters/v2/filterstatusget_test.go b/internal/api/client/filters/v2/filterstatusget_test.go index 5df3971a8..d7c27eed2 100644 --- a/internal/api/client/filters/v2/filterstatusget_test.go +++ b/internal/api/client/filters/v2/filterstatusget_test.go @@ -23,12 +23,12 @@ import ( "net/http" "net/http/httptest" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) getFilterStatus( diff --git a/internal/api/client/filters/v2/filterstatuspost.go b/internal/api/client/filters/v2/filterstatuspost.go index c6921e584..b7b6019ac 100644 --- a/internal/api/client/filters/v2/filterstatuspost.go +++ b/internal/api/client/filters/v2/filterstatuspost.go @@ -20,11 +20,11 @@ package v2 import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // FilterStatusPOSTHandler swagger:operation POST /api/v2/filters/{id}/statuses filterStatusPost diff --git a/internal/api/client/filters/v2/filterstatuspost_test.go b/internal/api/client/filters/v2/filterstatuspost_test.go index da068e14a..d6a960372 100644 --- a/internal/api/client/filters/v2/filterstatuspost_test.go +++ b/internal/api/client/filters/v2/filterstatuspost_test.go @@ -25,13 +25,13 @@ import ( "net/url" "strings" - filtersV2 "github.com/superseriousbusiness/gotosocial/internal/api/client/filters/v2" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" + filtersV2 "code.superseriousbusiness.org/gotosocial/internal/api/client/filters/v2" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FiltersTestSuite) postFilterStatus( diff --git a/internal/api/client/followedtags/followedtags.go b/internal/api/client/followedtags/followedtags.go index 27fca918d..056e8abfa 100644 --- a/internal/api/client/followedtags/followedtags.go +++ b/internal/api/client/followedtags/followedtags.go @@ -20,8 +20,8 @@ package followedtags import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/followedtags/followedtags_test.go b/internal/api/client/followedtags/followedtags_test.go index e7c83ca68..c1de03c3f 100644 --- a/internal/api/client/followedtags/followedtags_test.go +++ b/internal/api/client/followedtags/followedtags_test.go @@ -20,19 +20,19 @@ package followedtags_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followedtags" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followedtags" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FollowedTagsTestSuite struct { diff --git a/internal/api/client/followedtags/get.go b/internal/api/client/followedtags/get.go index f1fa45b07..5cd7e91fb 100644 --- a/internal/api/client/followedtags/get.go +++ b/internal/api/client/followedtags/get.go @@ -20,10 +20,10 @@ package followedtags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // FollowedTagsGETHandler swagger:operation GET /api/v1/followed_tags getFollowedTags diff --git a/internal/api/client/followedtags/get_test.go b/internal/api/client/followedtags/get_test.go index bd82c7037..41a8b43d8 100644 --- a/internal/api/client/followedtags/get_test.go +++ b/internal/api/client/followedtags/get_test.go @@ -24,12 +24,12 @@ import ( "net/http" "net/http/httptest" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followedtags" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followedtags" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *FollowedTagsTestSuite) getFollowedTags( diff --git a/internal/api/client/followrequests/authorize.go b/internal/api/client/followrequests/authorize.go index cc7b5598c..bcaad9be6 100644 --- a/internal/api/client/followrequests/authorize.go +++ b/internal/api/client/followrequests/authorize.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FollowRequestAuthorizePOSTHandler swagger:operation POST /api/v1/follow_requests/{account_id}/authorize authorizeFollowRequest diff --git a/internal/api/client/followrequests/authorize_test.go b/internal/api/client/followrequests/authorize_test.go index 4c0617958..712263e86 100644 --- a/internal/api/client/followrequests/authorize_test.go +++ b/internal/api/client/followrequests/authorize_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followrequests" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followrequests" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type AuthorizeTestSuite struct { diff --git a/internal/api/client/followrequests/followrequest.go b/internal/api/client/followrequests/followrequest.go index c2d72b476..4d4f0837a 100644 --- a/internal/api/client/followrequests/followrequest.go +++ b/internal/api/client/followrequests/followrequest.go @@ -20,8 +20,8 @@ package followrequests import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/followrequests/followrequest_test.go b/internal/api/client/followrequests/followrequest_test.go index e0f3bada7..fdbec220e 100644 --- a/internal/api/client/followrequests/followrequest_test.go +++ b/internal/api/client/followrequests/followrequest_test.go @@ -22,21 +22,21 @@ import ( "fmt" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followrequests" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followrequests" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FollowRequestStandardTestSuite struct { diff --git a/internal/api/client/followrequests/get.go b/internal/api/client/followrequests/get.go index 4b7760a6d..a55ea3ab2 100644 --- a/internal/api/client/followrequests/get.go +++ b/internal/api/client/followrequests/get.go @@ -20,10 +20,10 @@ package followrequests import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // FollowRequestGETHandler swagger:operation GET /api/v1/follow_requests getFollowRequests diff --git a/internal/api/client/followrequests/get_test.go b/internal/api/client/followrequests/get_test.go index bf16a509e..ad0fc839d 100644 --- a/internal/api/client/followrequests/get_test.go +++ b/internal/api/client/followrequests/get_test.go @@ -31,10 +31,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/tomnomnom/linkheader" ) diff --git a/internal/api/client/followrequests/reject.go b/internal/api/client/followrequests/reject.go index 4207925db..d60a1af08 100644 --- a/internal/api/client/followrequests/reject.go +++ b/internal/api/client/followrequests/reject.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // FollowRequestRejectPOSTHandler swagger:operation POST /api/v1/follow_requests/{account_id}/reject rejectFollowRequest diff --git a/internal/api/client/followrequests/reject_test.go b/internal/api/client/followrequests/reject_test.go index e6837066c..3d5f93286 100644 --- a/internal/api/client/followrequests/reject_test.go +++ b/internal/api/client/followrequests/reject_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/followrequests" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/followrequests" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type RejectTestSuite struct { diff --git a/internal/api/client/import/import.go b/internal/api/client/import/import.go index 8e2dde0c9..ebd4f64ad 100644 --- a/internal/api/client/import/import.go +++ b/internal/api/client/import/import.go @@ -26,10 +26,10 @@ import ( "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/processing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/import/import_test.go b/internal/api/client/import/import_test.go index b66749473..d6abcf242 100644 --- a/internal/api/client/import/import_test.go +++ b/internal/api/client/import/import_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/suite" - importdata "github.com/superseriousbusiness/gotosocial/internal/api/client/import" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" + importdata "code.superseriousbusiness.org/gotosocial/internal/api/client/import" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" ) type ImportTestSuite struct { diff --git a/internal/api/client/instance/instance.go b/internal/api/client/instance/instance.go index 82f6a4714..cd6c438c8 100644 --- a/internal/api/client/instance/instance.go +++ b/internal/api/client/instance/instance.go @@ -20,8 +20,8 @@ package instance import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/instance/instance_test.go b/internal/api/client/instance/instance_test.go index 1087e1a36..8e10c655d 100644 --- a/internal/api/client/instance/instance_test.go +++ b/internal/api/client/instance/instance_test.go @@ -22,21 +22,21 @@ import ( "fmt" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/instance" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/instance" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InstanceStandardTestSuite struct { diff --git a/internal/api/client/instance/instanceget.go b/internal/api/client/instance/instanceget.go index 3ca69d93b..4740fe1e8 100644 --- a/internal/api/client/instance/instanceget.go +++ b/internal/api/client/instance/instanceget.go @@ -20,10 +20,10 @@ package instance import ( "net/http" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" ) diff --git a/internal/api/client/instance/instancepatch.go b/internal/api/client/instance/instancepatch.go index 67856100d..b81f14298 100644 --- a/internal/api/client/instance/instancepatch.go +++ b/internal/api/client/instance/instancepatch.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // InstanceUpdatePATCHHandler swagger:operation PATCH /api/v1/instance instanceUpdate diff --git a/internal/api/client/instance/instancepatch_test.go b/internal/api/client/instance/instancepatch_test.go index b0ce795f0..5b2b71d37 100644 --- a/internal/api/client/instance/instancepatch_test.go +++ b/internal/api/client/instance/instancepatch_test.go @@ -26,11 +26,11 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/instance" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/instance" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InstancePatchTestSuite struct { @@ -85,8 +85,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "Example Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is the GoToSocial testrig. It doesn't federate or anything.</p><p>When the testrig is shut down, all data on it will be deleted.</p><p>Don't use this in production!</p>", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "someone@example.org", @@ -228,8 +228,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "Geoff's Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is the GoToSocial testrig. It doesn't federate or anything.</p><p>When the testrig is shut down, all data on it will be deleted.</p><p>Don't use this in production!</p>", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "admin@example.org", @@ -371,8 +371,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is some html, which is <em>allowed</em> in short descriptions.</p>", "short_description_text": "This is some html, which is <em>allowed</em> in short descriptions.", "email": "admin@example.org", @@ -565,8 +565,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is the GoToSocial testrig. It doesn't federate or anything.</p><p>When the testrig is shut down, all data on it will be deleted.</p><p>Don't use this in production!</p>", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "", @@ -730,8 +730,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is the GoToSocial testrig. It doesn't federate or anything.</p><p>When the testrig is shut down, all data on it will be deleted.</p><p>Don't use this in production!</p>", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "admin@example.org", @@ -914,8 +914,8 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", - "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/tree/main/testrig</a> and <a href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "<p>Here's a fuller description of the GoToSocial testrig instance.</p><p>This instance is for testing purposes only. It doesn't federate at all. Go check out <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig</a> and <a href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing</a></p><p>Users on this instance:</p><ul><li><span class=\"h-card\"><a href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>admin</span></a></span> (admin!).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span> (posts about turtles, we don't know why).</li><li><span class=\"h-card\"><a href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>the_mighty_zork</span></a></span> (who knows).</li></ul><p>If you need to edit the models for the testrig, you can do so at <code>internal/testmodels.go</code>.</p>", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "<p>This is the GoToSocial testrig. It doesn't federate or anything.</p><p>When the testrig is shut down, all data on it will be deleted.</p><p>Don't use this in production!</p>", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "admin@example.org", diff --git a/internal/api/client/instance/instancepeersget.go b/internal/api/client/instance/instancepeersget.go index 0b32a87e9..7afeb7104 100644 --- a/internal/api/client/instance/instancepeersget.go +++ b/internal/api/client/instance/instancepeersget.go @@ -22,9 +22,9 @@ import ( "net/http" "strings" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" ) diff --git a/internal/api/client/instance/instancepeersget_test.go b/internal/api/client/instance/instancepeersget_test.go index 2421205f7..a18e30875 100644 --- a/internal/api/client/instance/instancepeersget_test.go +++ b/internal/api/client/instance/instancepeersget_test.go @@ -27,13 +27,13 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/instance" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin/render" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/instance" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InstancePeersGetTestSuite struct { diff --git a/internal/api/client/instance/instancerulesget.go b/internal/api/client/instance/instancerulesget.go index 9df1b8fbe..8daedec74 100644 --- a/internal/api/client/instance/instancerulesget.go +++ b/internal/api/client/instance/instancerulesget.go @@ -20,9 +20,9 @@ package instance import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // instanceRulesGETHandler swagger:operation GET /api/v1/instance/rules rules diff --git a/internal/api/client/interactionpolicies/getdefaults.go b/internal/api/client/interactionpolicies/getdefaults.go index 870425e8d..a5890fc8b 100644 --- a/internal/api/client/interactionpolicies/getdefaults.go +++ b/internal/api/client/interactionpolicies/getdefaults.go @@ -20,9 +20,9 @@ package interactionpolicies import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PoliciesDefaultsGETHandler swagger:operation GET /api/v1/interaction_policies/defaults policiesDefaultsGet diff --git a/internal/api/client/interactionpolicies/policies.go b/internal/api/client/interactionpolicies/policies.go index 9b34a8c80..304218496 100644 --- a/internal/api/client/interactionpolicies/policies.go +++ b/internal/api/client/interactionpolicies/policies.go @@ -20,8 +20,8 @@ package interactionpolicies import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/interactionpolicies/updatedefaults.go b/internal/api/client/interactionpolicies/updatedefaults.go index 8496b00aa..1b3c0bc7a 100644 --- a/internal/api/client/interactionpolicies/updatedefaults.go +++ b/internal/api/client/interactionpolicies/updatedefaults.go @@ -21,12 +21,12 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/form/v4" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PoliciesDefaultsPATCHHandler swagger:operation PATCH /api/v1/interaction_policies/defaults policiesDefaultsUpdate diff --git a/internal/api/client/interactionrequests/authorize.go b/internal/api/client/interactionrequests/authorize.go index 8191923ba..81a612e7a 100644 --- a/internal/api/client/interactionrequests/authorize.go +++ b/internal/api/client/interactionrequests/authorize.go @@ -20,9 +20,9 @@ package interactionrequests import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // InteractionRequestAuthorizePOSTHandler swagger:operation POST /api/v1/interaction_requests/{id}/authorize authorizeInteractionRequest diff --git a/internal/api/client/interactionrequests/get.go b/internal/api/client/interactionrequests/get.go index d1d5f5eb4..a4f09f490 100644 --- a/internal/api/client/interactionrequests/get.go +++ b/internal/api/client/interactionrequests/get.go @@ -20,9 +20,9 @@ package interactionrequests import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // InteractionRequestGETHandler swagger:operation GET /api/v1/interaction_requests/{id} getInteractionRequest diff --git a/internal/api/client/interactionrequests/getpage.go b/internal/api/client/interactionrequests/getpage.go index f3f1251cc..d938b220f 100644 --- a/internal/api/client/interactionrequests/getpage.go +++ b/internal/api/client/interactionrequests/getpage.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // InteractionRequestsGETHandler swagger:operation GET /api/v1/interaction_requests getInteractionRequests diff --git a/internal/api/client/interactionrequests/interactionrequests.go b/internal/api/client/interactionrequests/interactionrequests.go index 172951817..b443a4f68 100644 --- a/internal/api/client/interactionrequests/interactionrequests.go +++ b/internal/api/client/interactionrequests/interactionrequests.go @@ -20,9 +20,9 @@ package interactionrequests import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/interactionrequests/reject.go b/internal/api/client/interactionrequests/reject.go index 0102d872a..2f87643a1 100644 --- a/internal/api/client/interactionrequests/reject.go +++ b/internal/api/client/interactionrequests/reject.go @@ -20,9 +20,9 @@ package interactionrequests import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // InteractionRequestRejectPOSTHandler swagger:operation POST /api/v1/interaction_requests/{id}/reject rejectInteractionRequest diff --git a/internal/api/client/lists/list.go b/internal/api/client/lists/list.go index 515075271..c3432c6b5 100644 --- a/internal/api/client/lists/list.go +++ b/internal/api/client/lists/list.go @@ -20,8 +20,8 @@ package lists import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/lists/listaccounts.go b/internal/api/client/lists/listaccounts.go index 4c6c00292..ac3f21ef5 100644 --- a/internal/api/client/lists/listaccounts.go +++ b/internal/api/client/lists/listaccounts.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // ListAccountsGETHandler swagger:operation GET /api/v1/lists/{id}/accounts listAccounts diff --git a/internal/api/client/lists/listaccounts_test.go b/internal/api/client/lists/listaccounts_test.go index e0a16e29f..f71055aaf 100644 --- a/internal/api/client/lists/listaccounts_test.go +++ b/internal/api/client/lists/listaccounts_test.go @@ -25,14 +25,14 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/lists" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/lists" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ListAccountsTestSuite struct { diff --git a/internal/api/client/lists/listaccountsadd.go b/internal/api/client/lists/listaccountsadd.go index b27cd1e92..b89b9100b 100644 --- a/internal/api/client/lists/listaccountsadd.go +++ b/internal/api/client/lists/listaccountsadd.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ListAccountsPOSTHandler swagger:operation POST /api/v1/lists/{id}/accounts addListAccounts diff --git a/internal/api/client/lists/listaccountsadd_test.go b/internal/api/client/lists/listaccountsadd_test.go index 7ed917e26..354019f46 100644 --- a/internal/api/client/lists/listaccountsadd_test.go +++ b/internal/api/client/lists/listaccountsadd_test.go @@ -26,11 +26,11 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/lists" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/lists" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ListAccountsAddTestSuite struct { diff --git a/internal/api/client/lists/listaccountsremove.go b/internal/api/client/lists/listaccountsremove.go index 160552d62..fc4cb0344 100644 --- a/internal/api/client/lists/listaccountsremove.go +++ b/internal/api/client/lists/listaccountsremove.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ListAccountsDELETEHandler swagger:operation DELETE /api/v1/lists/{id}/accounts removeListAccounts diff --git a/internal/api/client/lists/listcreate.go b/internal/api/client/lists/listcreate.go index 5d3daf2ed..75ad48b0c 100644 --- a/internal/api/client/lists/listcreate.go +++ b/internal/api/client/lists/listcreate.go @@ -21,12 +21,12 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // ListCreatePOSTHandler swagger:operation POST /api/v1/lists listCreate diff --git a/internal/api/client/lists/listdelete.go b/internal/api/client/lists/listdelete.go index 33c0add70..7e5b58b58 100644 --- a/internal/api/client/lists/listdelete.go +++ b/internal/api/client/lists/listdelete.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ListDELETEHandler swagger:operation DELETE /api/v1/lists/{id} listDelete diff --git a/internal/api/client/lists/listget.go b/internal/api/client/lists/listget.go index 008d516ba..e8e2759a8 100644 --- a/internal/api/client/lists/listget.go +++ b/internal/api/client/lists/listget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ListGETHandler swagger:operation GET /api/v1/lists/{id} list diff --git a/internal/api/client/lists/lists_test.go b/internal/api/client/lists/lists_test.go index 318bdc329..a89e74dcf 100644 --- a/internal/api/client/lists/lists_test.go +++ b/internal/api/client/lists/lists_test.go @@ -18,18 +18,18 @@ package lists_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/lists" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/lists" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ListsStandardTestSuite struct { diff --git a/internal/api/client/lists/listsget.go b/internal/api/client/lists/listsget.go index 9a40702b8..1cd4d33e0 100644 --- a/internal/api/client/lists/listsget.go +++ b/internal/api/client/lists/listsget.go @@ -20,9 +20,9 @@ package lists import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ListsGETHandler swagger:operation GET /api/v1/lists lists diff --git a/internal/api/client/lists/listupdate.go b/internal/api/client/lists/listupdate.go index 388d878a9..e4258b013 100644 --- a/internal/api/client/lists/listupdate.go +++ b/internal/api/client/lists/listupdate.go @@ -22,12 +22,12 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // ListUpdatePUTHandler swagger:operation PUT /api/v1/lists/{id} listUpdate diff --git a/internal/api/client/markers/markers.go b/internal/api/client/markers/markers.go index fcf584d12..b6369b797 100644 --- a/internal/api/client/markers/markers.go +++ b/internal/api/client/markers/markers.go @@ -20,8 +20,8 @@ package markers import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/markers/markersget.go b/internal/api/client/markers/markersget.go index f5b70ca68..5706e74cd 100644 --- a/internal/api/client/markers/markersget.go +++ b/internal/api/client/markers/markersget.go @@ -20,11 +20,11 @@ package markers import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) // MarkersGETHandler swagger:operation GET /api/v1/markers markersGet diff --git a/internal/api/client/markers/markerspost.go b/internal/api/client/markers/markerspost.go index e2fffa265..199d370d3 100644 --- a/internal/api/client/markers/markerspost.go +++ b/internal/api/client/markers/markerspost.go @@ -20,11 +20,11 @@ package markers import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // MarkersPOSTHandler swagger:operation POST /api/v1/markers markersPost diff --git a/internal/api/client/media/media.go b/internal/api/client/media/media.go index dc640d380..fe9a2c158 100644 --- a/internal/api/client/media/media.go +++ b/internal/api/client/media/media.go @@ -20,9 +20,9 @@ package media import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/media/mediacreate.go b/internal/api/client/media/mediacreate.go index 4abcb8b22..5b71dd527 100644 --- a/internal/api/client/media/mediacreate.go +++ b/internal/api/client/media/mediacreate.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // MediaCreatePOSTHandler swagger:operation POST /api/{api_version}/media mediaCreate diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go index 90acdf94e..2d7ce5545 100644 --- a/internal/api/client/media/mediacreate_test.go +++ b/internal/api/client/media/mediacreate_test.go @@ -28,22 +28,22 @@ import ( "net/http/httptest" "testing" + mediamodule "code.superseriousbusiness.org/gotosocial/internal/api/client/media" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaCreateTestSuite struct { diff --git a/internal/api/client/media/mediaget.go b/internal/api/client/media/mediaget.go index 8428e202f..e08ef6bfa 100644 --- a/internal/api/client/media/mediaget.go +++ b/internal/api/client/media/mediaget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // MediaGETHandler swagger:operation GET /api/v1/media/{id} mediaGet diff --git a/internal/api/client/media/mediaupdate.go b/internal/api/client/media/mediaupdate.go index b71b0c5f1..d10fc97b1 100644 --- a/internal/api/client/media/mediaupdate.go +++ b/internal/api/client/media/mediaupdate.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // MediaPUTHandler swagger:operation PUT /api/v1/media/{id} mediaUpdate diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go index 6b00de2f1..083406dd3 100644 --- a/internal/api/client/media/mediaupdate_test.go +++ b/internal/api/client/media/mediaupdate_test.go @@ -26,22 +26,22 @@ import ( "net/http/httptest" "testing" + mediamodule "code.superseriousbusiness.org/gotosocial/internal/api/client/media" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaUpdateTestSuite struct { diff --git a/internal/api/client/mutes/mutes.go b/internal/api/client/mutes/mutes.go index 217c08f91..95f3c575d 100644 --- a/internal/api/client/mutes/mutes.go +++ b/internal/api/client/mutes/mutes.go @@ -20,8 +20,8 @@ package mutes import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/mutes/mutes_test.go b/internal/api/client/mutes/mutes_test.go index bafb57355..b407c1d3c 100644 --- a/internal/api/client/mutes/mutes_test.go +++ b/internal/api/client/mutes/mutes_test.go @@ -23,21 +23,21 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/mutes" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/mutes" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MutesTestSuite struct { diff --git a/internal/api/client/mutes/mutesget.go b/internal/api/client/mutes/mutesget.go index 76c31ebc6..5aa4f99eb 100644 --- a/internal/api/client/mutes/mutesget.go +++ b/internal/api/client/mutes/mutesget.go @@ -20,10 +20,10 @@ package mutes import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // MutesGETHandler swagger:operation GET /api/v1/mutes mutesGet diff --git a/internal/api/client/mutes/mutesget_test.go b/internal/api/client/mutes/mutesget_test.go index f9cfe5d9c..978c1a845 100644 --- a/internal/api/client/mutes/mutesget_test.go +++ b/internal/api/client/mutes/mutesget_test.go @@ -25,13 +25,13 @@ import ( "net/http/httptest" "time" - "github.com/superseriousbusiness/gotosocial/internal/api/client/mutes" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/mutes" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) func (suite *MutesTestSuite) getMutedAccounts( diff --git a/internal/api/client/notifications/notificationget.go b/internal/api/client/notifications/notificationget.go index 0c15cf937..e9265d1bc 100644 --- a/internal/api/client/notifications/notificationget.go +++ b/internal/api/client/notifications/notificationget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // NotificationGETHandler swagger:operation GET /api/v1/notification/{id} notification diff --git a/internal/api/client/notifications/notifications.go b/internal/api/client/notifications/notifications.go index cb1edf3ff..c8edbc8f2 100644 --- a/internal/api/client/notifications/notifications.go +++ b/internal/api/client/notifications/notifications.go @@ -20,8 +20,8 @@ package notifications import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/notifications/notifications_test.go b/internal/api/client/notifications/notifications_test.go index 8da10593d..5814bc96c 100644 --- a/internal/api/client/notifications/notifications_test.go +++ b/internal/api/client/notifications/notifications_test.go @@ -18,19 +18,19 @@ package notifications_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/notifications" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/notifications" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type NotificationsTestSuite struct { diff --git a/internal/api/client/notifications/notificationsclear.go b/internal/api/client/notifications/notificationsclear.go index 3742f7eba..58c2c7f70 100644 --- a/internal/api/client/notifications/notificationsclear.go +++ b/internal/api/client/notifications/notificationsclear.go @@ -20,9 +20,9 @@ package notifications import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // NotificationsClearPOSTHandler swagger:operation POST /api/v1/notifications/clear clearNotifications diff --git a/internal/api/client/notifications/notificationsget.go b/internal/api/client/notifications/notificationsget.go index e02ca23d8..e6f0d342b 100644 --- a/internal/api/client/notifications/notificationsget.go +++ b/internal/api/client/notifications/notificationsget.go @@ -21,12 +21,12 @@ import ( "context" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // NotificationsGETHandler swagger:operation GET /api/v1/notifications notifications diff --git a/internal/api/client/notifications/notificationsget_test.go b/internal/api/client/notifications/notificationsget_test.go index 5a6f83959..78e746f79 100644 --- a/internal/api/client/notifications/notificationsget_test.go +++ b/internal/api/client/notifications/notificationsget_test.go @@ -27,15 +27,15 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/notifications" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/notifications" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) func (suite *NotificationsTestSuite) getNotifications( diff --git a/internal/api/client/polls/polls.go b/internal/api/client/polls/polls.go index a2c176449..ed5396361 100644 --- a/internal/api/client/polls/polls.go +++ b/internal/api/client/polls/polls.go @@ -20,9 +20,9 @@ package polls import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/polls/polls_get.go b/internal/api/client/polls/polls_get.go index e432b1f8e..dd3892abc 100644 --- a/internal/api/client/polls/polls_get.go +++ b/internal/api/client/polls/polls_get.go @@ -20,9 +20,9 @@ package polls import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PollGETHandler swagger:operation GET /api/v1/polls/{id} poll diff --git a/internal/api/client/polls/polls_test.go b/internal/api/client/polls/polls_test.go index fe6742ef5..bb1cdbac3 100644 --- a/internal/api/client/polls/polls_test.go +++ b/internal/api/client/polls/polls_test.go @@ -18,18 +18,18 @@ package polls_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/polls" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/polls" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type PollsStandardTestSuite struct { diff --git a/internal/api/client/polls/polls_vote.go b/internal/api/client/polls/polls_vote.go index 0c857e2d8..62352fbb0 100644 --- a/internal/api/client/polls/polls_vote.go +++ b/internal/api/client/polls/polls_vote.go @@ -22,10 +22,10 @@ import ( "net/http" "strconv" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PollVotePOSTHandler swagger:operation POST /api/v1/polls/{id}/votes pollVote diff --git a/internal/api/client/polls/polls_vote_test.go b/internal/api/client/polls/polls_vote_test.go index 54f98c192..eadfe1007 100644 --- a/internal/api/client/polls/polls_vote_test.go +++ b/internal/api/client/polls/polls_vote_test.go @@ -26,13 +26,13 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/polls" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/polls" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type PollCreateTestSuite struct { diff --git a/internal/api/client/preferences/preferences.go b/internal/api/client/preferences/preferences.go index 4a1ba8fe6..4a185388d 100644 --- a/internal/api/client/preferences/preferences.go +++ b/internal/api/client/preferences/preferences.go @@ -20,8 +20,8 @@ package preferences import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/preferences/preferencesget.go b/internal/api/client/preferences/preferencesget.go index 20cfc7d36..06485f53a 100644 --- a/internal/api/client/preferences/preferencesget.go +++ b/internal/api/client/preferences/preferencesget.go @@ -20,9 +20,9 @@ package preferences import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PreferencesGETHandler swagger:operation GET /api/v1/preferences preferencesGet diff --git a/internal/api/client/push/push.go b/internal/api/client/push/push.go index 33b974efa..fa0decb2c 100644 --- a/internal/api/client/push/push.go +++ b/internal/api/client/push/push.go @@ -20,8 +20,8 @@ package push import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/push/push_test.go b/internal/api/client/push/push_test.go index 6a3754546..7a1d3e2b9 100644 --- a/internal/api/client/push/push_test.go +++ b/internal/api/client/push/push_test.go @@ -20,18 +20,18 @@ package push_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type PushTestSuite struct { diff --git a/internal/api/client/push/pushsubscriptiondelete.go b/internal/api/client/push/pushsubscriptiondelete.go index c82222248..8cafa3e39 100644 --- a/internal/api/client/push/pushsubscriptiondelete.go +++ b/internal/api/client/push/pushsubscriptiondelete.go @@ -20,8 +20,8 @@ package push import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // PushSubscriptionDELETEHandler swagger:operation DELETE /api/v1/push/subscription pushSubscriptionDelete diff --git a/internal/api/client/push/pushsubscriptiondelete_test.go b/internal/api/client/push/pushsubscriptiondelete_test.go index 2548f2fb7..87f27647a 100644 --- a/internal/api/client/push/pushsubscriptiondelete_test.go +++ b/internal/api/client/push/pushsubscriptiondelete_test.go @@ -22,10 +22,10 @@ import ( "net/http" "net/http/httptest" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) // deleteSubscription deletes the push subscription for the named account and token. diff --git a/internal/api/client/push/pushsubscriptionget.go b/internal/api/client/push/pushsubscriptionget.go index d48e43108..2a3e69e3d 100644 --- a/internal/api/client/push/pushsubscriptionget.go +++ b/internal/api/client/push/pushsubscriptionget.go @@ -20,8 +20,8 @@ package push import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // PushSubscriptionGETHandler swagger:operation GET /api/v1/push/subscription pushSubscriptionGet diff --git a/internal/api/client/push/pushsubscriptionget_test.go b/internal/api/client/push/pushsubscriptionget_test.go index 80f387195..523b62936 100644 --- a/internal/api/client/push/pushsubscriptionget_test.go +++ b/internal/api/client/push/pushsubscriptionget_test.go @@ -24,11 +24,11 @@ import ( "net/http" "net/http/httptest" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) // getSubscription gets the push subscription for the named account and token. diff --git a/internal/api/client/push/pushsubscriptionpost.go b/internal/api/client/push/pushsubscriptionpost.go index 9893d7fe1..1929ae714 100644 --- a/internal/api/client/push/pushsubscriptionpost.go +++ b/internal/api/client/push/pushsubscriptionpost.go @@ -25,10 +25,10 @@ import ( "net/http" "net/url" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // PushSubscriptionPOSTHandler swagger:operation POST /api/v1/push/subscription pushSubscriptionPost diff --git a/internal/api/client/push/pushsubscriptionpost_test.go b/internal/api/client/push/pushsubscriptionpost_test.go index 251dde1f9..ecb387464 100644 --- a/internal/api/client/push/pushsubscriptionpost_test.go +++ b/internal/api/client/push/pushsubscriptionpost_test.go @@ -27,11 +27,11 @@ import ( "strconv" "strings" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) // postSubscription creates or replaces the push subscription for the named account and token. diff --git a/internal/api/client/push/pushsubscriptionput.go b/internal/api/client/push/pushsubscriptionput.go index 53e6a72e9..1a2b51cb7 100644 --- a/internal/api/client/push/pushsubscriptionput.go +++ b/internal/api/client/push/pushsubscriptionput.go @@ -20,11 +20,11 @@ package push import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // PushSubscriptionPUTHandler swagger:operation PUT /api/v1/push/subscription pushSubscriptionPut diff --git a/internal/api/client/push/pushsubscriptionput_test.go b/internal/api/client/push/pushsubscriptionput_test.go index 8b86add9e..584714221 100644 --- a/internal/api/client/push/pushsubscriptionput_test.go +++ b/internal/api/client/push/pushsubscriptionput_test.go @@ -27,11 +27,11 @@ import ( "strconv" "strings" - "github.com/superseriousbusiness/gotosocial/internal/api/client/push" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/api/client/push" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) // putSubscription updates the push subscription for the named account and token. diff --git a/internal/api/client/reports/reportcreate.go b/internal/api/client/reports/reportcreate.go index b9a4666ee..51e29a1b5 100644 --- a/internal/api/client/reports/reportcreate.go +++ b/internal/api/client/reports/reportcreate.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/regexes" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/regexes" ) // ReportPOSTHandler swagger:operation POST /api/v1/reports reportCreate diff --git a/internal/api/client/reports/reportcreate_test.go b/internal/api/client/reports/reportcreate_test.go index 35dc3d015..a94f46fa9 100644 --- a/internal/api/client/reports/reportcreate_test.go +++ b/internal/api/client/reports/reportcreate_test.go @@ -26,13 +26,13 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/reports" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/reports" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportCreateTestSuite struct { diff --git a/internal/api/client/reports/reportget.go b/internal/api/client/reports/reportget.go index 1219e4a12..abb677a31 100644 --- a/internal/api/client/reports/reportget.go +++ b/internal/api/client/reports/reportget.go @@ -20,9 +20,9 @@ package reports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ReportGETHandler swagger:operation GET /api/v1/reports/{id} reportGet diff --git a/internal/api/client/reports/reportget_test.go b/internal/api/client/reports/reportget_test.go index 51b80703d..59ee097cf 100644 --- a/internal/api/client/reports/reportget_test.go +++ b/internal/api/client/reports/reportget_test.go @@ -24,13 +24,13 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/reports" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/reports" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportGetTestSuite struct { diff --git a/internal/api/client/reports/reports.go b/internal/api/client/reports/reports.go index b10697c1f..40ff5a988 100644 --- a/internal/api/client/reports/reports.go +++ b/internal/api/client/reports/reports.go @@ -20,9 +20,9 @@ package reports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/reports/reports_test.go b/internal/api/client/reports/reports_test.go index 5de4b04b1..3abeff3b1 100644 --- a/internal/api/client/reports/reports_test.go +++ b/internal/api/client/reports/reports_test.go @@ -18,18 +18,18 @@ package reports_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/reports" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/reports" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportsStandardTestSuite struct { diff --git a/internal/api/client/reports/reportsget.go b/internal/api/client/reports/reportsget.go index 65adf664f..7d35fbd03 100644 --- a/internal/api/client/reports/reportsget.go +++ b/internal/api/client/reports/reportsget.go @@ -20,10 +20,10 @@ package reports import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // ReportsGETHandler swagger:operation GET /api/v1/reports reports diff --git a/internal/api/client/reports/reportsget_test.go b/internal/api/client/reports/reportsget_test.go index b6c3a0662..ffca6295c 100644 --- a/internal/api/client/reports/reportsget_test.go +++ b/internal/api/client/reports/reportsget_test.go @@ -26,15 +26,15 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/reports" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/reports" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportsGetTestSuite struct { diff --git a/internal/api/client/search/search.go b/internal/api/client/search/search.go index d413aff91..076d91cb1 100644 --- a/internal/api/client/search/search.go +++ b/internal/api/client/search/search.go @@ -20,9 +20,9 @@ package search import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/search/search_test.go b/internal/api/client/search/search_test.go index 98e7daeb3..77b2f5806 100644 --- a/internal/api/client/search/search_test.go +++ b/internal/api/client/search/search_test.go @@ -22,21 +22,21 @@ import ( "net/http" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/search" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/search" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type SearchStandardTestSuite struct { diff --git a/internal/api/client/search/searchget.go b/internal/api/client/search/searchget.go index 05a64f244..a5dc2527f 100644 --- a/internal/api/client/search/searchget.go +++ b/internal/api/client/search/searchget.go @@ -20,10 +20,10 @@ package search import ( "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // SearchGETHandler swagger:operation GET /api/{api_version}/search searchGet diff --git a/internal/api/client/search/searchget_test.go b/internal/api/client/search/searchget_test.go index 7d5b73572..b978c0d3f 100644 --- a/internal/api/client/search/searchget_test.go +++ b/internal/api/client/search/searchget_test.go @@ -30,16 +30,16 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/search" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/search" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type SearchGetTestSuite struct { diff --git a/internal/api/client/statuses/status.go b/internal/api/client/statuses/status.go index 88b34cbf5..77b295bcd 100644 --- a/internal/api/client/statuses/status.go +++ b/internal/api/client/statuses/status.go @@ -20,8 +20,8 @@ package statuses import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/statuses/status_test.go b/internal/api/client/statuses/status_test.go index 1e6edbb17..71ff8ba35 100644 --- a/internal/api/client/statuses/status_test.go +++ b/internal/api/client/statuses/status_test.go @@ -24,20 +24,20 @@ import ( "net/http/httptest" "strings" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusStandardTestSuite struct { diff --git a/internal/api/client/statuses/statusbookmark.go b/internal/api/client/statuses/statusbookmark.go index 059ed7e57..804044763 100644 --- a/internal/api/client/statuses/statusbookmark.go +++ b/internal/api/client/statuses/statusbookmark.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusBookmarkPOSTHandler swagger:operation POST /api/v1/statuses/{id}/bookmark statusBookmark diff --git a/internal/api/client/statuses/statusbookmark_test.go b/internal/api/client/statuses/statusbookmark_test.go index 6899831e9..5ef4fbe3f 100644 --- a/internal/api/client/statuses/statusbookmark_test.go +++ b/internal/api/client/statuses/statusbookmark_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusBookmarkTestSuite struct { diff --git a/internal/api/client/statuses/statusboost.go b/internal/api/client/statuses/statusboost.go index fb4c5e5ee..5e8418dec 100644 --- a/internal/api/client/statuses/statusboost.go +++ b/internal/api/client/statuses/statusboost.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusBoostPOSTHandler swagger:operation POST /api/v1/statuses/{id}/reblog statusReblog diff --git a/internal/api/client/statuses/statusboost_test.go b/internal/api/client/statuses/statusboost_test.go index 703dc580c..333334bbc 100644 --- a/internal/api/client/statuses/statusboost_test.go +++ b/internal/api/client/statuses/statusboost_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusBoostTestSuite struct { diff --git a/internal/api/client/statuses/statusboostedby.go b/internal/api/client/statuses/statusboostedby.go index 9ee82c709..70111afcc 100644 --- a/internal/api/client/statuses/statusboostedby.go +++ b/internal/api/client/statuses/statusboostedby.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusBoostedByGETHandler swagger:operation GET /api/v1/statuses/{id}/reblogged_by statusBoostedBy diff --git a/internal/api/client/statuses/statusboostedby_test.go b/internal/api/client/statuses/statusboostedby_test.go index 881f4808e..f5cd657be 100644 --- a/internal/api/client/statuses/statusboostedby_test.go +++ b/internal/api/client/statuses/statusboostedby_test.go @@ -24,11 +24,11 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusBoostedByTestSuite struct { diff --git a/internal/api/client/statuses/statuscontext.go b/internal/api/client/statuses/statuscontext.go index cae48e938..4a5e8abf3 100644 --- a/internal/api/client/statuses/statuscontext.go +++ b/internal/api/client/statuses/statuscontext.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusContextGETHandler swagger:operation GET /api/v1/statuses/{id}/context threadContext diff --git a/internal/api/client/statuses/statuscreate.go b/internal/api/client/statuses/statuscreate.go index 686e29ec4..048acd421 100644 --- a/internal/api/client/statuses/statuscreate.go +++ b/internal/api/client/statuses/statuscreate.go @@ -22,13 +22,13 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-playground/form/v4" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // StatusCreatePOSTHandler swagger:operation POST /api/v1/statuses statusCreate diff --git a/internal/api/client/statuses/statuscreate_test.go b/internal/api/client/statuses/statuscreate_test.go index aba39ba23..514109223 100644 --- a/internal/api/client/statuses/statuscreate_test.go +++ b/internal/api/client/statuses/statuscreate_test.go @@ -28,12 +28,12 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusCreateTestSuite struct { diff --git a/internal/api/client/statuses/statusdelete.go b/internal/api/client/statuses/statusdelete.go index c5ff046f7..006b6e601 100644 --- a/internal/api/client/statuses/statusdelete.go +++ b/internal/api/client/statuses/statusdelete.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusDELETEHandler swagger:operation DELETE /api/v1/statuses/{id} statusDelete diff --git a/internal/api/client/statuses/statusdelete_test.go b/internal/api/client/statuses/statusdelete_test.go index d7efd5725..2cf40213f 100644 --- a/internal/api/client/statuses/statusdelete_test.go +++ b/internal/api/client/statuses/statusdelete_test.go @@ -25,13 +25,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusDeleteTestSuite struct { diff --git a/internal/api/client/statuses/statusedit.go b/internal/api/client/statuses/statusedit.go index 5c58c5098..22d22da71 100644 --- a/internal/api/client/statuses/statusedit.go +++ b/internal/api/client/statuses/statusedit.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // StatusEditPUTHandler swagger:operation PUT /api/v1/statuses/{id} statusEdit diff --git a/internal/api/client/statuses/statusfave.go b/internal/api/client/statuses/statusfave.go index 23ff2d7a1..54d717ddd 100644 --- a/internal/api/client/statuses/statusfave.go +++ b/internal/api/client/statuses/statusfave.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusFavePOSTHandler swagger:operation POST /api/v1/statuses/{id}/favourite statusFave diff --git a/internal/api/client/statuses/statusfave_test.go b/internal/api/client/statuses/statusfave_test.go index 983935184..11ac4fc5f 100644 --- a/internal/api/client/statuses/statusfave_test.go +++ b/internal/api/client/statuses/statusfave_test.go @@ -24,15 +24,15 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" ) type StatusFaveTestSuite struct { diff --git a/internal/api/client/statuses/statusfavedby.go b/internal/api/client/statuses/statusfavedby.go index a4a0611ce..baa1bcf0d 100644 --- a/internal/api/client/statuses/statusfavedby.go +++ b/internal/api/client/statuses/statusfavedby.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusFavedByGETHandler swagger:operation GET /api/v1/statuses/{id}/favourited_by statusFavedBy diff --git a/internal/api/client/statuses/statusfavedby_test.go b/internal/api/client/statuses/statusfavedby_test.go index a51c06421..15d38e5e8 100644 --- a/internal/api/client/statuses/statusfavedby_test.go +++ b/internal/api/client/statuses/statusfavedby_test.go @@ -26,13 +26,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusFavedByTestSuite struct { diff --git a/internal/api/client/statuses/statusget.go b/internal/api/client/statuses/statusget.go index f8fb2cb50..ac91f6e44 100644 --- a/internal/api/client/statuses/statusget.go +++ b/internal/api/client/statuses/statusget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusGETHandler swagger:operation GET /api/v1/statuses/{id} statusGet diff --git a/internal/api/client/statuses/statushistory.go b/internal/api/client/statuses/statushistory.go index d493b6ffe..2f94d38d1 100644 --- a/internal/api/client/statuses/statushistory.go +++ b/internal/api/client/statuses/statushistory.go @@ -20,9 +20,9 @@ package statuses import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusHistoryGETHandler swagger:operation GET /api/v1/statuses/{id}/history statusHistoryGet diff --git a/internal/api/client/statuses/statushistory_test.go b/internal/api/client/statuses/statushistory_test.go index fe650402f..3f6d56493 100644 --- a/internal/api/client/statuses/statushistory_test.go +++ b/internal/api/client/statuses/statushistory_test.go @@ -27,11 +27,11 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusHistoryTestSuite struct { diff --git a/internal/api/client/statuses/statusmute.go b/internal/api/client/statuses/statusmute.go index 42df112a3..a73029f7c 100644 --- a/internal/api/client/statuses/statusmute.go +++ b/internal/api/client/statuses/statusmute.go @@ -20,9 +20,9 @@ package statuses import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusMutePOSTHandler swagger:operation POST /api/v1/statuses/{id}/mute statusMute diff --git a/internal/api/client/statuses/statusmute_test.go b/internal/api/client/statuses/statusmute_test.go index a98eff78a..d3c880f09 100644 --- a/internal/api/client/statuses/statusmute_test.go +++ b/internal/api/client/statuses/statusmute_test.go @@ -27,12 +27,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusMuteTestSuite struct { diff --git a/internal/api/client/statuses/statuspin.go b/internal/api/client/statuses/statuspin.go index 0c4c681a6..b12842ef2 100644 --- a/internal/api/client/statuses/statuspin.go +++ b/internal/api/client/statuses/statuspin.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusPinPOSTHandler swagger:operation POST /api/v1/statuses/{id}/pin statusPin diff --git a/internal/api/client/statuses/statuspin_test.go b/internal/api/client/statuses/statuspin_test.go index e9b65bd37..87650dd43 100644 --- a/internal/api/client/statuses/statuspin_test.go +++ b/internal/api/client/statuses/statuspin_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusPinTestSuite struct { diff --git a/internal/api/client/statuses/statussource.go b/internal/api/client/statuses/statussource.go index fd15e8719..aed57098f 100644 --- a/internal/api/client/statuses/statussource.go +++ b/internal/api/client/statuses/statussource.go @@ -20,9 +20,9 @@ package statuses import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusSourceGETHandler swagger:operation GET /api/v1/statuses/{id}/source statusSourceGet diff --git a/internal/api/client/statuses/statussource_test.go b/internal/api/client/statuses/statussource_test.go index e36a939ef..8439f12fa 100644 --- a/internal/api/client/statuses/statussource_test.go +++ b/internal/api/client/statuses/statussource_test.go @@ -27,11 +27,11 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusSourceTestSuite struct { diff --git a/internal/api/client/statuses/statusunbookmark.go b/internal/api/client/statuses/statusunbookmark.go index ca4e669a7..695600edf 100644 --- a/internal/api/client/statuses/statusunbookmark.go +++ b/internal/api/client/statuses/statusunbookmark.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusUnbookmarkPOSTHandler swagger:operation POST /api/v1/statuses/{id}/unbookmark statusUnbookmark diff --git a/internal/api/client/statuses/statusunbookmark_test.go b/internal/api/client/statuses/statusunbookmark_test.go index e62219913..cf95dab6d 100644 --- a/internal/api/client/statuses/statusunbookmark_test.go +++ b/internal/api/client/statuses/statusunbookmark_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusUnbookmarkTestSuite struct { diff --git a/internal/api/client/statuses/statusunboost.go b/internal/api/client/statuses/statusunboost.go index c7fd00ab7..7863696df 100644 --- a/internal/api/client/statuses/statusunboost.go +++ b/internal/api/client/statuses/statusunboost.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusUnboostPOSTHandler swagger:operation POST /api/v1/statuses/{id}/unreblog statusUnreblog diff --git a/internal/api/client/statuses/statusunfave.go b/internal/api/client/statuses/statusunfave.go index d7dbe10ce..a19c56eed 100644 --- a/internal/api/client/statuses/statusunfave.go +++ b/internal/api/client/statuses/statusunfave.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusUnfavePOSTHandler swagger:operation POST /api/v1/statuses/{id}/unfavourite statusUnfave diff --git a/internal/api/client/statuses/statusunfave_test.go b/internal/api/client/statuses/statusunfave_test.go index d02de47a5..004f4d892 100644 --- a/internal/api/client/statuses/statusunfave_test.go +++ b/internal/api/client/statuses/statusunfave_test.go @@ -26,13 +26,13 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusUnfaveTestSuite struct { diff --git a/internal/api/client/statuses/statusunmute.go b/internal/api/client/statuses/statusunmute.go index 76018fd27..e1e89da3b 100644 --- a/internal/api/client/statuses/statusunmute.go +++ b/internal/api/client/statuses/statusunmute.go @@ -20,9 +20,9 @@ package statuses import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusUnmutePOSTHandler swagger:operation POST /api/v1/statuses/{id}/unmute statusUnmute diff --git a/internal/api/client/statuses/statusunpin.go b/internal/api/client/statuses/statusunpin.go index 32cb913e0..90d1e7b7f 100644 --- a/internal/api/client/statuses/statusunpin.go +++ b/internal/api/client/statuses/statusunpin.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // StatusUnpinPOSTHandler swagger:operation POST /api/v1/statuses/{id}/unpin statusUnpin diff --git a/internal/api/client/statuses/statusunpin_test.go b/internal/api/client/statuses/statusunpin_test.go index 14253f804..b9e600c4f 100644 --- a/internal/api/client/statuses/statusunpin_test.go +++ b/internal/api/client/statuses/statusunpin_test.go @@ -24,13 +24,13 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/statuses" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/statuses" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusUnpinTestSuite struct { diff --git a/internal/api/client/streaming/stream.go b/internal/api/client/streaming/stream.go index 8fafed7c2..7bb65f7a1 100644 --- a/internal/api/client/streaming/stream.go +++ b/internal/api/client/streaming/stream.go @@ -24,12 +24,12 @@ import ( "slices" "time" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - streampkg "github.com/superseriousbusiness/gotosocial/internal/stream" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + streampkg "code.superseriousbusiness.org/gotosocial/internal/stream" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" diff --git a/internal/api/client/streaming/streaming.go b/internal/api/client/streaming/streaming.go index 303e16cd3..3a8426fe3 100644 --- a/internal/api/client/streaming/streaming.go +++ b/internal/api/client/streaming/streaming.go @@ -21,9 +21,9 @@ import ( "net/http" "time" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/streaming/streaming_test.go b/internal/api/client/streaming/streaming_test.go index f33a8efe2..f81e18f08 100644 --- a/internal/api/client/streaming/streaming_test.go +++ b/internal/api/client/streaming/streaming_test.go @@ -29,21 +29,21 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/streaming" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/streaming" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StreamingTestSuite struct { diff --git a/internal/api/client/tags/follow.go b/internal/api/client/tags/follow.go index 07804013a..f8b81780a 100644 --- a/internal/api/client/tags/follow.go +++ b/internal/api/client/tags/follow.go @@ -20,8 +20,8 @@ package tags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // FollowTagPOSTHandler swagger:operation POST /api/v1/tags/{tag_name}/follow followTag diff --git a/internal/api/client/tags/follow_test.go b/internal/api/client/tags/follow_test.go index d3b08cf5c..87f903452 100644 --- a/internal/api/client/tags/follow_test.go +++ b/internal/api/client/tags/follow_test.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tags" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tags" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" ) func (suite *TagsTestSuite) follow( diff --git a/internal/api/client/tags/get.go b/internal/api/client/tags/get.go index a6a433d7d..0a88a418d 100644 --- a/internal/api/client/tags/get.go +++ b/internal/api/client/tags/get.go @@ -20,8 +20,8 @@ package tags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // TagGETHandler swagger:operation GET /api/v1/tags/{tag_name} getTag diff --git a/internal/api/client/tags/get_test.go b/internal/api/client/tags/get_test.go index fa31bce7d..d8052822e 100644 --- a/internal/api/client/tags/get_test.go +++ b/internal/api/client/tags/get_test.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tags" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tags" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" ) // tagAction follows or unfollows a tag. diff --git a/internal/api/client/tags/tags.go b/internal/api/client/tags/tags.go index 281859547..34a88abfc 100644 --- a/internal/api/client/tags/tags.go +++ b/internal/api/client/tags/tags.go @@ -20,9 +20,9 @@ package tags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/tags/tags_test.go b/internal/api/client/tags/tags_test.go index 4718d5f34..a09d07861 100644 --- a/internal/api/client/tags/tags_test.go +++ b/internal/api/client/tags/tags_test.go @@ -24,23 +24,23 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tags" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tags" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TagsTestSuite struct { diff --git a/internal/api/client/tags/unfollow.go b/internal/api/client/tags/unfollow.go index 49ebd463e..1dd0e6a9d 100644 --- a/internal/api/client/tags/unfollow.go +++ b/internal/api/client/tags/unfollow.go @@ -20,8 +20,8 @@ package tags import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // UnfollowTagPOSTHandler swagger:operation POST /api/v1/tags/{tag_name}/unfollow unfollowTag diff --git a/internal/api/client/tags/unfollow_test.go b/internal/api/client/tags/unfollow_test.go index 51bc34797..5b748a8aa 100644 --- a/internal/api/client/tags/unfollow_test.go +++ b/internal/api/client/tags/unfollow_test.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tags" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tags" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" ) func (suite *TagsTestSuite) unfollow( diff --git a/internal/api/client/timelines/home.go b/internal/api/client/timelines/home.go index 4cb0ae8aa..9a7276bdd 100644 --- a/internal/api/client/timelines/home.go +++ b/internal/api/client/timelines/home.go @@ -20,10 +20,10 @@ package timelines import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // HomeTimelineGETHandler swagger:operation GET /api/v1/timelines/home homeTimeline diff --git a/internal/api/client/timelines/list.go b/internal/api/client/timelines/list.go index 2e89f16ea..e76107f1d 100644 --- a/internal/api/client/timelines/list.go +++ b/internal/api/client/timelines/list.go @@ -20,10 +20,10 @@ package timelines import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // ListTimelineGETHandler swagger:operation GET /api/v1/timelines/list/{id} listTimeline diff --git a/internal/api/client/timelines/public.go b/internal/api/client/timelines/public.go index 7a4a68b77..5fa32ac03 100644 --- a/internal/api/client/timelines/public.go +++ b/internal/api/client/timelines/public.go @@ -20,11 +20,11 @@ package timelines import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // PublicTimelineGETHandler swagger:operation GET /api/v1/timelines/public publicTimeline diff --git a/internal/api/client/timelines/tag.go b/internal/api/client/timelines/tag.go index 8c3a86f81..daf88f528 100644 --- a/internal/api/client/timelines/tag.go +++ b/internal/api/client/timelines/tag.go @@ -20,9 +20,9 @@ package timelines import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // TagTimelineGETHandler swagger:operation GET /api/v1/timelines/tag/{tag_name} tagTimeline diff --git a/internal/api/client/timelines/timeline.go b/internal/api/client/timelines/timeline.go index 2362ca47e..86e0597d0 100644 --- a/internal/api/client/timelines/timeline.go +++ b/internal/api/client/timelines/timeline.go @@ -20,9 +20,9 @@ package timelines import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/tokens/tokenget.go b/internal/api/client/tokens/tokenget.go index c88b78743..c0ef980a3 100644 --- a/internal/api/client/tokens/tokenget.go +++ b/internal/api/client/tokens/tokenget.go @@ -20,9 +20,9 @@ package tokens import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // TokenInfoGETHandler swagger:operation GET /api/v1/tokens/{id} tokenInfoGet diff --git a/internal/api/client/tokens/tokenget_test.go b/internal/api/client/tokens/tokenget_test.go index c7cbf3022..89ad7a642 100644 --- a/internal/api/client/tokens/tokenget_test.go +++ b/internal/api/client/tokens/tokenget_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tokens" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tokens" ) type TokenGetTestSuite struct { diff --git a/internal/api/client/tokens/tokeninvalidate.go b/internal/api/client/tokens/tokeninvalidate.go index 192bbf33b..eab77cc04 100644 --- a/internal/api/client/tokens/tokeninvalidate.go +++ b/internal/api/client/tokens/tokeninvalidate.go @@ -20,9 +20,9 @@ package tokens import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // TokenInvalidatePOSTHandler swagger:operation POST /api/v1/tokens/{id}/invalidate tokenInvalidatePost diff --git a/internal/api/client/tokens/tokeninvalidate_test.go b/internal/api/client/tokens/tokeninvalidate_test.go index 281f9b96d..2e726bd50 100644 --- a/internal/api/client/tokens/tokeninvalidate_test.go +++ b/internal/api/client/tokens/tokeninvalidate_test.go @@ -22,9 +22,9 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tokens" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tokens" - "github.com/superseriousbusiness/gotosocial/internal/db" ) type TokenInvalidateTestSuite struct { diff --git a/internal/api/client/tokens/tokens.go b/internal/api/client/tokens/tokens.go index aadaf72c2..0e7b5399e 100644 --- a/internal/api/client/tokens/tokens.go +++ b/internal/api/client/tokens/tokens.go @@ -20,9 +20,9 @@ package tokens import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/tokens/tokens_test.go b/internal/api/client/tokens/tokens_test.go index bae140194..852723978 100644 --- a/internal/api/client/tokens/tokens_test.go +++ b/internal/api/client/tokens/tokens_test.go @@ -23,12 +23,12 @@ import ( "io" "net/http/httptest" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tokens" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tokens" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TokensStandardTestSuite struct { diff --git a/internal/api/client/tokens/tokensget.go b/internal/api/client/tokens/tokensget.go index 5c92beccc..ee85c730f 100644 --- a/internal/api/client/tokens/tokensget.go +++ b/internal/api/client/tokens/tokensget.go @@ -20,10 +20,10 @@ package tokens import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // TokensInfoGETHandler swagger:operation GET /api/v1/tokens tokensInfoGet diff --git a/internal/api/client/tokens/tokensget_test.go b/internal/api/client/tokens/tokensget_test.go index 0164c0379..acf05cb70 100644 --- a/internal/api/client/tokens/tokensget_test.go +++ b/internal/api/client/tokens/tokensget_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/tokens" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/tokens" ) type TokensGetTestSuite struct { diff --git a/internal/api/client/user/emailchange.go b/internal/api/client/user/emailchange.go index 09d5e8fde..d0238824d 100644 --- a/internal/api/client/user/emailchange.go +++ b/internal/api/client/user/emailchange.go @@ -21,10 +21,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // EmailChangePOSTHandler swagger:operation POST /api/v1/user/email_change userEmailChange diff --git a/internal/api/client/user/emailchange_test.go b/internal/api/client/user/emailchange_test.go index 868ad766c..bdd052ca6 100644 --- a/internal/api/client/user/emailchange_test.go +++ b/internal/api/client/user/emailchange_test.go @@ -23,11 +23,11 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/user" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/user" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmailChangeTestSuite struct { diff --git a/internal/api/client/user/passwordchange.go b/internal/api/client/user/passwordchange.go index 8b1c7e29a..caa90583f 100644 --- a/internal/api/client/user/passwordchange.go +++ b/internal/api/client/user/passwordchange.go @@ -21,11 +21,11 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const OIDCPasswordHelp = "password change request cannot be processed by GoToSocial as this instance is running with OIDC enabled; you must change password using your OIDC provider" diff --git a/internal/api/client/user/passwordchange_test.go b/internal/api/client/user/passwordchange_test.go index baf6f6b8d..8fee821c0 100644 --- a/internal/api/client/user/passwordchange_test.go +++ b/internal/api/client/user/passwordchange_test.go @@ -23,10 +23,10 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/client/user" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "codeberg.org/gruf/go-byteutil" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/client/user" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/api/client/user/twofactor.go b/internal/api/client/user/twofactor.go index f6e2bffc2..a359607e4 100644 --- a/internal/api/client/user/twofactor.go +++ b/internal/api/client/user/twofactor.go @@ -21,11 +21,11 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) const OIDCTwoFactorHelp = "two factor authentication request cannot be processed by GoToSocial as this instance is running with OIDC enabled; you must use 2FA provided by your OIDC provider" diff --git a/internal/api/client/user/user.go b/internal/api/client/user/user.go index 7a95c5e33..d150173df 100644 --- a/internal/api/client/user/user.go +++ b/internal/api/client/user/user.go @@ -20,8 +20,8 @@ package user import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/client/user/user_test.go b/internal/api/client/user/user_test.go index a7891d8b1..4170e4dcd 100644 --- a/internal/api/client/user/user_test.go +++ b/internal/api/client/user/user_test.go @@ -22,20 +22,20 @@ import ( "net/http/httptest" "net/url" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/client/user" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/client/user" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type UserStandardTestSuite struct { diff --git a/internal/api/client/user/userget.go b/internal/api/client/user/userget.go index c82a6d644..ff92815b6 100644 --- a/internal/api/client/user/userget.go +++ b/internal/api/client/user/userget.go @@ -20,9 +20,9 @@ package user import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // UserGETHandler swagger:operation GET /api/v1/user getUser diff --git a/internal/api/fileserver.go b/internal/api/fileserver.go index e0377b0e6..11aad2b42 100644 --- a/internal/api/fileserver.go +++ b/internal/api/fileserver.go @@ -18,13 +18,13 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/fileserver" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/fileserver" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type Fileserver struct { diff --git a/internal/api/fileserver/fileserver.go b/internal/api/fileserver/fileserver.go index db15ce2e0..bbf178404 100644 --- a/internal/api/fileserver/fileserver.go +++ b/internal/api/fileserver/fileserver.go @@ -20,8 +20,8 @@ package fileserver import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/fileserver/fileserver_test.go b/internal/api/fileserver/fileserver_test.go index b650cb7be..880f69ed0 100644 --- a/internal/api/fileserver/fileserver_test.go +++ b/internal/api/fileserver/fileserver_test.go @@ -18,21 +18,21 @@ package fileserver_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/fileserver" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/fileserver" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FileserverTestSuite struct { diff --git a/internal/api/fileserver/servefile.go b/internal/api/fileserver/servefile.go index 56285ea48..04cbe10f6 100644 --- a/internal/api/fileserver/servefile.go +++ b/internal/api/fileserver/servefile.go @@ -25,12 +25,12 @@ import ( "strings" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-fastcopy" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // ServeFile is for serving attachments, headers, and avatars to the requester from instance storage. diff --git a/internal/api/fileserver/servefile_test.go b/internal/api/fileserver/servefile_test.go index 33afe34d0..cfaa73515 100644 --- a/internal/api/fileserver/servefile_test.go +++ b/internal/api/fileserver/servefile_test.go @@ -24,12 +24,12 @@ import ( "net/http/httptest" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/fileserver" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/fileserver" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ServeFileTestSuite struct { diff --git a/internal/api/health.go b/internal/api/health.go index e1dfd1924..8ea9446b2 100644 --- a/internal/api/health.go +++ b/internal/api/health.go @@ -20,10 +20,10 @@ package api import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/api/health" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/health" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type Health struct { diff --git a/internal/api/health/ready.go b/internal/api/health/ready.go index 70e3a324a..04efea17c 100644 --- a/internal/api/health/ready.go +++ b/internal/api/health/ready.go @@ -20,7 +20,7 @@ package health import ( "net/http" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" ) diff --git a/internal/api/metrics.go b/internal/api/metrics.go index 5d97b9610..add14b0bb 100644 --- a/internal/api/metrics.go +++ b/internal/api/metrics.go @@ -18,11 +18,11 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/metrics" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/metrics" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type Metrics struct { diff --git a/internal/api/model/content.go b/internal/api/model/content.go index 5af81b11b..ec8d4652a 100644 --- a/internal/api/model/content.go +++ b/internal/api/model/content.go @@ -20,7 +20,7 @@ package model import ( "io" - "github.com/superseriousbusiness/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/storage" ) // Content wraps everything needed to serve a blob of content (some kind of media) through the API. diff --git a/internal/api/model/poll.go b/internal/api/model/poll.go index 089dfc0f0..0fd8c02ea 100644 --- a/internal/api/model/poll.go +++ b/internal/api/model/poll.go @@ -17,7 +17,7 @@ package model -import "github.com/superseriousbusiness/gotosocial/internal/language" +import "code.superseriousbusiness.org/gotosocial/internal/language" // Poll represents a poll attached to a status. // diff --git a/internal/api/model/status.go b/internal/api/model/status.go index bcd0c0f93..4561996ad 100644 --- a/internal/api/model/status.go +++ b/internal/api/model/status.go @@ -20,7 +20,7 @@ package model import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/language" + "code.superseriousbusiness.org/gotosocial/internal/language" ) // Status models a status or post. diff --git a/internal/api/nodeinfo.go b/internal/api/nodeinfo.go index 2f0c234fd..9a65b4038 100644 --- a/internal/api/nodeinfo.go +++ b/internal/api/nodeinfo.go @@ -18,12 +18,12 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/nodeinfo" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/nodeinfo" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type NodeInfo struct { diff --git a/internal/api/nodeinfo/nodeinfo.go b/internal/api/nodeinfo/nodeinfo.go index 96adbc956..55f871f3f 100644 --- a/internal/api/nodeinfo/nodeinfo.go +++ b/internal/api/nodeinfo/nodeinfo.go @@ -20,8 +20,8 @@ package nodeinfo import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/nodeinfo/nodeinfoget.go b/internal/api/nodeinfo/nodeinfoget.go index 28a60cff9..b8f2d7e4f 100644 --- a/internal/api/nodeinfo/nodeinfoget.go +++ b/internal/api/nodeinfo/nodeinfoget.go @@ -21,9 +21,9 @@ import ( "errors" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // NodeInfo2GETHandler swagger:operation GET /nodeinfo/{schema_version} nodeInfoGet diff --git a/internal/api/robots.go b/internal/api/robots.go index 29e2823ef..bbf1bd3fb 100644 --- a/internal/api/robots.go +++ b/internal/api/robots.go @@ -18,10 +18,10 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/robots" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/robots" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type Robots struct { diff --git a/internal/api/robots/robots.go b/internal/api/robots/robots.go index b72a01ed6..c4dfa1da2 100644 --- a/internal/api/robots/robots.go +++ b/internal/api/robots/robots.go @@ -20,9 +20,9 @@ package robots import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" ) type Module struct{} diff --git a/internal/api/util/auth.go b/internal/api/util/auth.go index 481ca8776..f224c1d2e 100644 --- a/internal/api/util/auth.go +++ b/internal/api/util/auth.go @@ -22,11 +22,11 @@ import ( "slices" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "code.superseriousbusiness.org/oauth2/v4" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) // Auth wraps an authorized token, application, user, and account. diff --git a/internal/api/util/errorhandling.go b/internal/api/util/errorhandling.go index d2b9171c8..3341e7399 100644 --- a/internal/api/util/errorhandling.go +++ b/internal/api/util/errorhandling.go @@ -22,12 +22,12 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-kv" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // TODO: add more templated html pages here for different error types diff --git a/internal/api/util/mime_test.go b/internal/api/util/mime_test.go index 6b12d1436..25b5fb0d1 100644 --- a/internal/api/util/mime_test.go +++ b/internal/api/util/mime_test.go @@ -3,7 +3,7 @@ package util_test import ( "testing" - "github.com/superseriousbusiness/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/api/util" ) func TestIsASContentType(t *testing.T) { diff --git a/internal/api/util/opengraph.go b/internal/api/util/opengraph.go index 770bada83..321b0f92d 100644 --- a/internal/api/util/opengraph.go +++ b/internal/api/util/opengraph.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/text" ) const maxOGDescriptionLength = 300 diff --git a/internal/api/util/opengraph_test.go b/internal/api/util/opengraph_test.go index 4e94d78ef..821aabaff 100644 --- a/internal/api/util/opengraph_test.go +++ b/internal/api/util/opengraph_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" ) type OpenGraphTestSuite struct { diff --git a/internal/api/util/parseform.go b/internal/api/util/parseform.go index 8bb10012c..a2fbe9ee9 100644 --- a/internal/api/util/parseform.go +++ b/internal/api/util/parseform.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // ParseFocus parses a media attachment focus parameters from incoming API string. diff --git a/internal/api/util/parsequery.go b/internal/api/util/parsequery.go index 9f4c02aed..fc2c16c15 100644 --- a/internal/api/util/parsequery.go +++ b/internal/api/util/parsequery.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) const ( diff --git a/internal/api/util/response.go b/internal/api/util/response.go index 01f15ccfb..105537f36 100644 --- a/internal/api/util/response.go +++ b/internal/api/util/response.go @@ -26,10 +26,10 @@ import ( "strconv" "sync" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-byteutil" "codeberg.org/gruf/go-fastcopy" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/log" ) var ( diff --git a/internal/api/util/scopes_test.go b/internal/api/util/scopes_test.go index 72f6b57aa..2e1df8ca9 100644 --- a/internal/api/util/scopes_test.go +++ b/internal/api/util/scopes_test.go @@ -20,7 +20,7 @@ package util_test import ( "testing" - "github.com/superseriousbusiness/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/api/util" ) func TestScopes(t *testing.T) { diff --git a/internal/api/util/template.go b/internal/api/util/template.go index 86d179cdc..67aeb7033 100644 --- a/internal/api/util/template.go +++ b/internal/api/util/template.go @@ -21,10 +21,10 @@ import ( "net/http" "net/netip" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // WebPage encapsulates variables for diff --git a/internal/api/wellknown.go b/internal/api/wellknown.go index 90e18d637..4f793e4cc 100644 --- a/internal/api/wellknown.go +++ b/internal/api/wellknown.go @@ -18,13 +18,13 @@ package api import ( + "code.superseriousbusiness.org/gotosocial/internal/api/wellknown/hostmeta" + "code.superseriousbusiness.org/gotosocial/internal/api/wellknown/nodeinfo" + "code.superseriousbusiness.org/gotosocial/internal/api/wellknown/webfinger" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/wellknown/hostmeta" - "github.com/superseriousbusiness/gotosocial/internal/api/wellknown/nodeinfo" - "github.com/superseriousbusiness/gotosocial/internal/api/wellknown/webfinger" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type WellKnown struct { diff --git a/internal/api/wellknown/hostmeta/hostmeta.go b/internal/api/wellknown/hostmeta/hostmeta.go index 43c6b161e..b0967bfb1 100644 --- a/internal/api/wellknown/hostmeta/hostmeta.go +++ b/internal/api/wellknown/hostmeta/hostmeta.go @@ -20,9 +20,9 @@ package hostmeta import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/wellknown/hostmeta/hostmetaget.go b/internal/api/wellknown/hostmeta/hostmetaget.go index 131e2ac58..c6676cabe 100644 --- a/internal/api/wellknown/hostmeta/hostmetaget.go +++ b/internal/api/wellknown/hostmeta/hostmetaget.go @@ -20,9 +20,9 @@ package hostmeta import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // HostMetaGETHandler swagger:operation GET /.well-known/host-meta hostMetaGet diff --git a/internal/api/wellknown/nodeinfo/nodeinfo.go b/internal/api/wellknown/nodeinfo/nodeinfo.go index 270dde2b1..7b266bab7 100644 --- a/internal/api/wellknown/nodeinfo/nodeinfo.go +++ b/internal/api/wellknown/nodeinfo/nodeinfo.go @@ -20,12 +20,12 @@ package nodeinfo import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/wellknown/webfinger/webfinger.go b/internal/api/wellknown/webfinger/webfinger.go index c70afab9d..d60b0bfc3 100644 --- a/internal/api/wellknown/webfinger/webfinger.go +++ b/internal/api/wellknown/webfinger/webfinger.go @@ -20,9 +20,9 @@ package webfinger import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) const ( diff --git a/internal/api/wellknown/webfinger/webfinger_test.go b/internal/api/wellknown/webfinger/webfinger_test.go index 11f64ae9b..becd1e749 100644 --- a/internal/api/wellknown/webfinger/webfinger_test.go +++ b/internal/api/wellknown/webfinger/webfinger_test.go @@ -18,20 +18,20 @@ package webfinger_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/api/wellknown/webfinger" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/api/wellknown/webfinger" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type WebfingerStandardTestSuite struct { diff --git a/internal/api/wellknown/webfinger/webfingerget.go b/internal/api/wellknown/webfinger/webfingerget.go index 74cb8fefe..e277622fd 100644 --- a/internal/api/wellknown/webfinger/webfingerget.go +++ b/internal/api/wellknown/webfinger/webfingerget.go @@ -22,11 +22,11 @@ import ( "fmt" "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // WebfingerGETRequest swagger:operation GET /.well-known/webfinger webfingerGet diff --git a/internal/api/wellknown/webfinger/webfingerget_test.go b/internal/api/wellknown/webfinger/webfingerget_test.go index 94c084146..a0a8aa22f 100644 --- a/internal/api/wellknown/webfinger/webfingerget_test.go +++ b/internal/api/wellknown/webfinger/webfingerget_test.go @@ -29,17 +29,17 @@ import ( "net/http/httptest" "testing" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/api/wellknown/webfinger" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/api/wellknown/webfinger" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/testrig" ) type WebfingerGetTestSuite struct { diff --git a/internal/cache/cache.go b/internal/cache/cache.go index e3fd0d1fe..d05b85a15 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -20,11 +20,11 @@ package cache import ( "time" + "code.superseriousbusiness.org/gotosocial/internal/cache/headerfilter" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-cache/v3/ttl" - "github.com/superseriousbusiness/gotosocial/internal/cache/headerfilter" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) type Caches struct { diff --git a/internal/cache/db.go b/internal/cache/db.go index 82cd9ac5f..31e78f0a5 100644 --- a/internal/cache/db.go +++ b/internal/cache/db.go @@ -20,11 +20,11 @@ package cache import ( "sync/atomic" + "code.superseriousbusiness.org/gotosocial/internal/cache/domain" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/cache/domain" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" ) type DBCaches struct { diff --git a/internal/cache/domain/domain_test.go b/internal/cache/domain/domain_test.go index 974425b7c..a3cbbca78 100644 --- a/internal/cache/domain/domain_test.go +++ b/internal/cache/domain/domain_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/superseriousbusiness/gotosocial/internal/cache/domain" + "code.superseriousbusiness.org/gotosocial/internal/cache/domain" ) func TestCache(t *testing.T) { diff --git a/internal/cache/headerfilter/filter.go b/internal/cache/headerfilter/filter.go index 96b6e757f..afab0b3f7 100644 --- a/internal/cache/headerfilter/filter.go +++ b/internal/cache/headerfilter/filter.go @@ -22,8 +22,8 @@ import ( "net/http" "sync/atomic" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/headerfilter" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/headerfilter" ) // Cache provides a means of caching headerfilter.Filters in diff --git a/internal/cache/invalidate.go b/internal/cache/invalidate.go index 949238ec6..3512bb51e 100644 --- a/internal/cache/invalidate.go +++ b/internal/cache/invalidate.go @@ -18,8 +18,8 @@ package cache import ( - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Below are cache invalidation hooks between other caches, diff --git a/internal/cache/size.go b/internal/cache/size.go index 9a30d5f08..2d9acc7ba 100644 --- a/internal/cache/size.go +++ b/internal/cache/size.go @@ -23,13 +23,13 @@ import ( "time" "unsafe" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-cache/v3/simple" "github.com/DmitriyVTitov/size" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" ) const ( diff --git a/internal/cache/timeline.go b/internal/cache/timeline.go index 3e6a68558..1709751da 100644 --- a/internal/cache/timeline.go +++ b/internal/cache/timeline.go @@ -18,8 +18,8 @@ package cache import ( - "github.com/superseriousbusiness/gotosocial/internal/cache/timeline" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/cache/timeline" + "code.superseriousbusiness.org/gotosocial/internal/log" ) type TimelineCaches struct { diff --git a/internal/cache/timeline/preload.go b/internal/cache/timeline/preload.go index b941a8b0c..c2daa2fc6 100644 --- a/internal/cache/timeline/preload.go +++ b/internal/cache/timeline/preload.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // preloader provides a means of synchronising the diff --git a/internal/cache/timeline/status.go b/internal/cache/timeline/status.go index 071fc5a36..56d90e422 100644 --- a/internal/cache/timeline/status.go +++ b/internal/cache/timeline/status.go @@ -23,13 +23,13 @@ import ( "codeberg.org/gruf/go-structr" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) // repeatBoostDepth determines the minimum count diff --git a/internal/cache/timeline/status_test.go b/internal/cache/timeline/status_test.go index 3e53d8256..6a288d2ea 100644 --- a/internal/cache/timeline/status_test.go +++ b/internal/cache/timeline/status_test.go @@ -21,10 +21,10 @@ import ( "slices" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "codeberg.org/gruf/go-structr" "github.com/stretchr/testify/assert" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) var testStatusMeta = []*StatusMeta{ diff --git a/internal/cache/timeline/timeline.go b/internal/cache/timeline/timeline.go index 4f8797e82..a6eb31fc2 100644 --- a/internal/cache/timeline/timeline.go +++ b/internal/cache/timeline/timeline.go @@ -20,9 +20,9 @@ package timeline import ( "time" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) // plus1hULID returns a ULID for now+1h. diff --git a/internal/cache/util.go b/internal/cache/util.go index ceb053e34..783fc2e24 100644 --- a/internal/cache/util.go +++ b/internal/cache/util.go @@ -20,8 +20,8 @@ package cache import ( "errors" + "code.superseriousbusiness.org/gotosocial/internal/db" errorsv2 "codeberg.org/gruf/go-errors/v2" - "github.com/superseriousbusiness/gotosocial/internal/db" ) // SentinelError is an error that can be returned and checked against to indicate a non-permanent diff --git a/internal/cache/visibility.go b/internal/cache/visibility.go index a424ca5ac..63927cf08 100644 --- a/internal/cache/visibility.go +++ b/internal/cache/visibility.go @@ -18,9 +18,9 @@ package cache import ( + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" ) type VisibilityCache struct { diff --git a/internal/cleaner/cleaner.go b/internal/cleaner/cleaner.go index 62e84a09b..7e32566ee 100644 --- a/internal/cleaner/cleaner.go +++ b/internal/cleaner/cleaner.go @@ -21,12 +21,12 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" ) const ( diff --git a/internal/cleaner/cleaner_test.go b/internal/cleaner/cleaner_test.go index 42006611b..b3c38abdd 100644 --- a/internal/cleaner/cleaner_test.go +++ b/internal/cleaner/cleaner_test.go @@ -20,11 +20,11 @@ package cleaner_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type CleanerTestSuite struct { diff --git a/internal/cleaner/emoji.go b/internal/cleaner/emoji.go index 05588ccb2..245dfac27 100644 --- a/internal/cleaner/emoji.go +++ b/internal/cleaner/emoji.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Emoji encompasses a set of diff --git a/internal/cleaner/emoji_test.go b/internal/cleaner/emoji_test.go index 30642a818..b789d2d5a 100644 --- a/internal/cleaner/emoji_test.go +++ b/internal/cleaner/emoji_test.go @@ -5,11 +5,11 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func copyMap(in map[string]*gtsmodel.Emoji) map[string]*gtsmodel.Emoji { diff --git a/internal/cleaner/media.go b/internal/cleaner/media.go index 9a6855ab2..6384ba368 100644 --- a/internal/cleaner/media.go +++ b/internal/cleaner/media.go @@ -22,15 +22,15 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // Media encompasses a set of diff --git a/internal/cleaner/media_test.go b/internal/cleaner/media_test.go index 54afc1c0b..02470f72d 100644 --- a/internal/cleaner/media_test.go +++ b/internal/cleaner/media_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaTestSuite struct { diff --git a/internal/config/config.go b/internal/config/config.go index d4b3901e7..07676627d 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -21,9 +21,9 @@ import ( "reflect" "time" + "code.superseriousbusiness.org/gotosocial/internal/language" "codeberg.org/gruf/go-bytesize" "github.com/mitchellh/mapstructure" - "github.com/superseriousbusiness/gotosocial/internal/language" ) // cfgtype is the reflected type information of Configuration{}. diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 5f41cbe08..006d4a449 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/config" "gopkg.in/yaml.v3" ) diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 9a507b421..f07aeb41b 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -20,9 +20,9 @@ package config import ( "time" + "code.superseriousbusiness.org/gotosocial/internal/language" "codeberg.org/gruf/go-bytesize" "github.com/coreos/go-oidc/v3/oidc" - "github.com/superseriousbusiness/gotosocial/internal/language" ) // Defaults contains a populated Configuration with reasonable defaults. Note that diff --git a/internal/config/gen/gen.go b/internal/config/gen/gen.go index 9130f8606..dda321e7c 100644 --- a/internal/config/gen/gen.go +++ b/internal/config/gen/gen.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/superseriousbusiness/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/config" ) const license = `// GoToSocial @@ -67,7 +67,7 @@ func main() { fmt.Fprint(output, "import (\n") fmt.Fprint(output, "\t\"time\"\n\n") fmt.Fprint(output, "\t\"codeberg.org/gruf/go-bytesize\"\n") - fmt.Fprint(output, "\t\"github.com/superseriousbusiness/gotosocial/internal/language\"\n") + fmt.Fprint(output, "\t\"code.superseriousbusiness.org/gotosocial/internal/language\"\n") fmt.Fprint(output, ")\n\n") generateFields(output, nil, reflect.TypeOf(config.Configuration{})) _ = output.Close() diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go index ac41a73e9..56eb0e3e8 100644 --- a/internal/config/helpers.gen.go +++ b/internal/config/helpers.gen.go @@ -21,8 +21,8 @@ package config import ( "time" + "code.superseriousbusiness.org/gotosocial/internal/language" "codeberg.org/gruf/go-bytesize" - "github.com/superseriousbusiness/gotosocial/internal/language" ) // GetLogLevel safely fetches the Configuration value for state's 'LogLevel' field diff --git a/internal/config/validate.go b/internal/config/validate.go index d36d18ba4..f1c50e4a1 100644 --- a/internal/config/validate.go +++ b/internal/config/validate.go @@ -22,10 +22,10 @@ import ( "net/url" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/language" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/miekg/dns" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/language" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // Validate validates global config settings. diff --git a/internal/config/validate_test.go b/internal/config/validate_test.go index 1ae3d6c78..fb20ea0fb 100644 --- a/internal/config/validate_test.go +++ b/internal/config/validate_test.go @@ -20,9 +20,9 @@ package config_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ConfigValidateTestSuite struct { diff --git a/internal/db/account.go b/internal/db/account.go index 0caac3453..59ea9ff1a 100644 --- a/internal/db/account.go +++ b/internal/db/account.go @@ -21,8 +21,8 @@ import ( "context" "net/netip" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Account contains functions related to account getting/setting/creation. diff --git a/internal/db/admin.go b/internal/db/admin.go index 1f24c7932..d33917547 100644 --- a/internal/db/admin.go +++ b/internal/db/admin.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Admin contains functions related to instance administration (new signups etc). diff --git a/internal/db/advancedmigration.go b/internal/db/advancedmigration.go index 2b4601bdb..13ccf1835 100644 --- a/internal/db/advancedmigration.go +++ b/internal/db/advancedmigration.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type AdvancedMigration interface { diff --git a/internal/db/application.go b/internal/db/application.go index 76948b0fd..4781c9a95 100644 --- a/internal/db/application.go +++ b/internal/db/application.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) type Application interface { diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go index 88a923ecf..66dc3b307 100644 --- a/internal/db/bundb/account.go +++ b/internal/db/bundb/account.go @@ -26,17 +26,17 @@ import ( "strings" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/account_test.go b/internal/db/bundb/account_test.go index ffd44de79..bb842415c 100644 --- a/internal/db/bundb/account_test.go +++ b/internal/db/bundb/account_test.go @@ -29,13 +29,13 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type AccountTestSuite struct { diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go index 12cb6a6f7..9f5ccad01 100644 --- a/internal/db/bundb/admin.go +++ b/internal/db/bundb/admin.go @@ -27,16 +27,16 @@ import ( "strings" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/google/uuid" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" "github.com/uptrace/bun" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/db/bundb/admin_test.go b/internal/db/bundb/admin_test.go index 8018ef3fa..0ac3cc073 100644 --- a/internal/db/bundb/admin_test.go +++ b/internal/db/bundb/admin_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AdminTestSuite struct { diff --git a/internal/db/bundb/advancedmigration.go b/internal/db/bundb/advancedmigration.go index 2a0ec93e6..d8e6e66d2 100644 --- a/internal/db/bundb/advancedmigration.go +++ b/internal/db/bundb/advancedmigration.go @@ -20,8 +20,8 @@ package bundb import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/application.go b/internal/db/bundb/application.go index 562614e5e..9df4b54c7 100644 --- a/internal/db/bundb/application.go +++ b/internal/db/bundb/application.go @@ -22,12 +22,12 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/application_test.go b/internal/db/bundb/application_test.go index 540c632b5..858cb15b6 100644 --- a/internal/db/bundb/application_test.go +++ b/internal/db/bundb/application_test.go @@ -23,9 +23,9 @@ import ( "reflect" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ApplicationTestSuite struct { diff --git a/internal/db/bundb/basic.go b/internal/db/bundb/basic.go index 82212fc42..2384ee9b7 100644 --- a/internal/db/bundb/basic.go +++ b/internal/db/bundb/basic.go @@ -21,8 +21,8 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/basic_test.go b/internal/db/bundb/basic_test.go index 4c5ea8d18..bdda1cad3 100644 --- a/internal/db/bundb/basic_test.go +++ b/internal/db/bundb/basic_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type BasicTestSuite struct { diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go index 18fe5384c..8a3108ef2 100644 --- a/internal/db/bundb/bundb.go +++ b/internal/db/bundb/bundb.go @@ -32,17 +32,17 @@ import ( "strings" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/observability" + "code.superseriousbusiness.org/gotosocial/internal/state" "codeberg.org/gruf/go-bytesize" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/stdlib" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/observability" - "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/dialect/pgdialect" diff --git a/internal/db/bundb/bundb_test.go b/internal/db/bundb/bundb_test.go index dc22dbcf4..7e673eb19 100644 --- a/internal/db/bundb/bundb_test.go +++ b/internal/db/bundb/bundb_test.go @@ -18,11 +18,11 @@ package bundb_test import ( + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type BunDBStandardTestSuite struct { diff --git a/internal/db/bundb/bundbnew_test.go b/internal/db/bundb/bundbnew_test.go index e05c21ef3..6dbe2120b 100644 --- a/internal/db/bundb/bundbnew_test.go +++ b/internal/db/bundb/bundbnew_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb" ) type BundbNewTestSuite struct { diff --git a/internal/db/bundb/conversation.go b/internal/db/bundb/conversation.go index 354463111..0946ed23b 100644 --- a/internal/db/bundb/conversation.go +++ b/internal/db/bundb/conversation.go @@ -23,15 +23,15 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/conversation_test.go b/internal/db/bundb/conversation_test.go index 24d35d482..15cdf8b3c 100644 --- a/internal/db/bundb/conversation_test.go +++ b/internal/db/bundb/conversation_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db/test" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/db/test" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ConversationTestSuite struct { diff --git a/internal/db/bundb/domain.go b/internal/db/bundb/domain.go index 23b9abc74..3d9ab41d0 100644 --- a/internal/db/bundb/domain.go +++ b/internal/db/bundb/domain.go @@ -22,12 +22,12 @@ import ( "net/url" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/domain_test.go b/internal/db/bundb/domain_test.go index a56f469c4..553cdeb80 100644 --- a/internal/db/bundb/domain_test.go +++ b/internal/db/bundb/domain_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type DomainTestSuite struct { diff --git a/internal/db/bundb/domainpermissiondraft.go b/internal/db/bundb/domainpermissiondraft.go index 281db1224..0fe0eb2b1 100644 --- a/internal/db/bundb/domainpermissiondraft.go +++ b/internal/db/bundb/domainpermissiondraft.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/domainpermissiondraft_test.go b/internal/db/bundb/domainpermissiondraft_test.go index e4f255483..b3bb20d00 100644 --- a/internal/db/bundb/domainpermissiondraft_test.go +++ b/internal/db/bundb/domainpermissiondraft_test.go @@ -22,10 +22,10 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type DomainPermissionDraftTestSuite struct { diff --git a/internal/db/bundb/domainpermissionexclude.go b/internal/db/bundb/domainpermissionexclude.go index 1527a584b..ee8c13c81 100644 --- a/internal/db/bundb/domainpermissionexclude.go +++ b/internal/db/bundb/domainpermissionexclude.go @@ -22,14 +22,14 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/domainpermissionexclude_test.go b/internal/db/bundb/domainpermissionexclude_test.go index 47af710f9..dd55d7add 100644 --- a/internal/db/bundb/domainpermissionexclude_test.go +++ b/internal/db/bundb/domainpermissionexclude_test.go @@ -22,10 +22,10 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type DomainPermissionExcludeTestSuite struct { diff --git a/internal/db/bundb/domainpermissionsubscription.go b/internal/db/bundb/domainpermissionsubscription.go index be22b96a3..1f7e609e8 100644 --- a/internal/db/bundb/domainpermissionsubscription.go +++ b/internal/db/bundb/domainpermissionsubscription.go @@ -22,12 +22,12 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/domainpermissionsubscription_test.go b/internal/db/bundb/domainpermissionsubscription_test.go index 7a5cf8685..b05330138 100644 --- a/internal/db/bundb/domainpermissionsubscription_test.go +++ b/internal/db/bundb/domainpermissionsubscription_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type DomainPermissionSubscriptionTestSuite struct { diff --git a/internal/db/bundb/drivers.go b/internal/db/bundb/drivers.go index f39189c9d..e4f60ff6c 100644 --- a/internal/db/bundb/drivers.go +++ b/internal/db/bundb/drivers.go @@ -20,8 +20,8 @@ package bundb import ( "database/sql" - "github.com/superseriousbusiness/gotosocial/internal/db/postgres" - "github.com/superseriousbusiness/gotosocial/internal/db/sqlite" + "code.superseriousbusiness.org/gotosocial/internal/db/postgres" + "code.superseriousbusiness.org/gotosocial/internal/db/sqlite" ) func init() { diff --git a/internal/db/bundb/emoji.go b/internal/db/bundb/emoji.go index ee564317e..bea96f6bf 100644 --- a/internal/db/bundb/emoji.go +++ b/internal/db/bundb/emoji.go @@ -24,14 +24,14 @@ import ( "strings" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/emoji_test.go b/internal/db/bundb/emoji_test.go index a4bf18f6e..a71678eac 100644 --- a/internal/db/bundb/emoji_test.go +++ b/internal/db/bundb/emoji_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmojiTestSuite struct { diff --git a/internal/db/bundb/errors_test.go b/internal/db/bundb/errors_test.go index 400780196..a235e185b 100644 --- a/internal/db/bundb/errors_test.go +++ b/internal/db/bundb/errors_test.go @@ -22,9 +22,9 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ErrorsTestSuite struct { diff --git a/internal/db/bundb/filter.go b/internal/db/bundb/filter.go index fe23bb405..24208b1f3 100644 --- a/internal/db/bundb/filter.go +++ b/internal/db/bundb/filter.go @@ -23,11 +23,11 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/filter_test.go b/internal/db/bundb/filter_test.go index fbb2a6bfb..faa2957d6 100644 --- a/internal/db/bundb/filter_test.go +++ b/internal/db/bundb/filter_test.go @@ -22,10 +22,10 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type FilterTestSuite struct { diff --git a/internal/db/bundb/filterkeyword.go b/internal/db/bundb/filterkeyword.go index 0e1d8daeb..1c80061e9 100644 --- a/internal/db/bundb/filterkeyword.go +++ b/internal/db/bundb/filterkeyword.go @@ -22,11 +22,11 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/filterkeyword_test.go b/internal/db/bundb/filterkeyword_test.go index 91c8d192c..e1482a225 100644 --- a/internal/db/bundb/filterkeyword_test.go +++ b/internal/db/bundb/filterkeyword_test.go @@ -21,9 +21,9 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // TestFilterKeywordCRUD tests CRUD and read-all operations on filter keywords. diff --git a/internal/db/bundb/filterstatus.go b/internal/db/bundb/filterstatus.go index 1cd924d13..a14e2a7b4 100644 --- a/internal/db/bundb/filterstatus.go +++ b/internal/db/bundb/filterstatus.go @@ -22,10 +22,10 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/filterstatus_test.go b/internal/db/bundb/filterstatus_test.go index 48ddb1bed..e5dceb7f1 100644 --- a/internal/db/bundb/filterstatus_test.go +++ b/internal/db/bundb/filterstatus_test.go @@ -21,9 +21,9 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // TestFilterStatusCRD tests CRD (no U) and read-all operations on filter statuses. diff --git a/internal/db/bundb/headerfilter.go b/internal/db/bundb/headerfilter.go index b02d9249e..ffd08a787 100644 --- a/internal/db/bundb/headerfilter.go +++ b/internal/db/bundb/headerfilter.go @@ -23,8 +23,8 @@ import ( "time" "unsafe" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/headerfilter_test.go b/internal/db/bundb/headerfilter_test.go index d7e2b26ee..85a2dd03e 100644 --- a/internal/db/bundb/headerfilter_test.go +++ b/internal/db/bundb/headerfilter_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type HeaderFilterTestSuite struct { diff --git a/internal/db/bundb/hook.go b/internal/db/bundb/hook.go index 16de74f11..798868ccb 100644 --- a/internal/db/bundb/hook.go +++ b/internal/db/bundb/hook.go @@ -21,8 +21,8 @@ import ( "context" "time" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go index 154c1d34e..824adeff4 100644 --- a/internal/db/bundb/instance.go +++ b/internal/db/bundb/instance.go @@ -21,15 +21,15 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/instance_test.go b/internal/db/bundb/instance_test.go index c0d63003d..c6f177821 100644 --- a/internal/db/bundb/instance_test.go +++ b/internal/db/bundb/instance_test.go @@ -21,11 +21,11 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type InstanceTestSuite struct { diff --git a/internal/db/bundb/interaction.go b/internal/db/bundb/interaction.go index 9fbe00711..3de75ded1 100644 --- a/internal/db/bundb/interaction.go +++ b/internal/db/bundb/interaction.go @@ -22,14 +22,14 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/interaction_test.go b/internal/db/bundb/interaction_test.go index 1eb8154c1..4518f7ac9 100644 --- a/internal/db/bundb/interaction_test.go +++ b/internal/db/bundb/interaction_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type InteractionTestSuite struct { diff --git a/internal/db/bundb/list.go b/internal/db/bundb/list.go index 75296bc57..e1afa64d4 100644 --- a/internal/db/bundb/list.go +++ b/internal/db/bundb/list.go @@ -24,14 +24,14 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/list_test.go b/internal/db/bundb/list_test.go index 3952a87c0..dde336c46 100644 --- a/internal/db/bundb/list_test.go +++ b/internal/db/bundb/list_test.go @@ -22,9 +22,9 @@ import ( "slices" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ListTestSuite struct { diff --git a/internal/db/bundb/marker.go b/internal/db/bundb/marker.go index 80b87e232..14ce60e1c 100644 --- a/internal/db/bundb/marker.go +++ b/internal/db/bundb/marker.go @@ -23,9 +23,9 @@ import ( "fmt" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/markers_test.go b/internal/db/bundb/markers_test.go index eb0a43437..618fb3383 100644 --- a/internal/db/bundb/markers_test.go +++ b/internal/db/bundb/markers_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // MarkersTestSuite uses home timelines for Get tests diff --git a/internal/db/bundb/media.go b/internal/db/bundb/media.go index 09c8188f0..845844980 100644 --- a/internal/db/bundb/media.go +++ b/internal/db/bundb/media.go @@ -23,12 +23,12 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/mention.go b/internal/db/bundb/mention.go index 04aa5d76e..e70541ede 100644 --- a/internal/db/bundb/mention.go +++ b/internal/db/bundb/mention.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20211113114307_init.go b/internal/db/bundb/migrations/20211113114307_init.go index 63783beb8..061cd99ab 100644 --- a/internal/db/bundb/migrations/20211113114307_init.go +++ b/internal/db/bundb/migrations/20211113114307_init.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220214175650_media_cleanup.go b/internal/db/bundb/migrations/20220214175650_media_cleanup.go index 3a8ec7b5a..f1691dca0 100644 --- a/internal/db/bundb/migrations/20220214175650_media_cleanup.go +++ b/internal/db/bundb/migrations/20220214175650_media_cleanup.go @@ -22,8 +22,8 @@ import ( "database/sql" "time" - previousgtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init" - newgtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20220214175650_media_cleanup" + previousgtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init" + newgtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20220214175650_media_cleanup" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220305130328_database_optimizations.go b/internal/db/bundb/migrations/20220305130328_database_optimizations.go index 897e4f91f..cfabfe2ac 100644 --- a/internal/db/bundb/migrations/20220305130328_database_optimizations.go +++ b/internal/db/bundb/migrations/20220305130328_database_optimizations.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220315160814_admin_account_actions.go b/internal/db/bundb/migrations/20220315160814_admin_account_actions.go index 5fcbfc127..83a06e7b8 100644 --- a/internal/db/bundb/migrations/20220315160814_admin_account_actions.go +++ b/internal/db/bundb/migrations/20220315160814_admin_account_actions.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20220315160814_admin_account_actions" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20220315160814_admin_account_actions" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220502113806_add_missing_indexes.go b/internal/db/bundb/migrations/20220502113806_add_missing_indexes.go index 601f26e77..7cbdada60 100644 --- a/internal/db/bundb/migrations/20220502113806_add_missing_indexes.go +++ b/internal/db/bundb/migrations/20220502113806_add_missing_indexes.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220518123621_additional_indexing.go b/internal/db/bundb/migrations/20220518123621_additional_indexing.go index 4aa3450a9..08198b0c0 100644 --- a/internal/db/bundb/migrations/20220518123621_additional_indexing.go +++ b/internal/db/bundb/migrations/20220518123621_additional_indexing.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go index 6c280fb11..fd714aa5c 100644 --- a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go +++ b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go @@ -23,11 +23,11 @@ import ( "errors" "fmt" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-storage" "codeberg.org/gruf/go-storage/disk" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220710153020_fix_slow_web_profile_queries.go b/internal/db/bundb/migrations/20220710153020_fix_slow_web_profile_queries.go index 02d591158..5765908f0 100644 --- a/internal/db/bundb/migrations/20220710153020_fix_slow_web_profile_queries.go +++ b/internal/db/bundb/migrations/20220710153020_fix_slow_web_profile_queries.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220827085121_assign_missing_in_reply_to_uris.go b/internal/db/bundb/migrations/20220827085121_assign_missing_in_reply_to_uris.go index c7a4dce78..e12a44632 100644 --- a/internal/db/bundb/migrations/20220827085121_assign_missing_in_reply_to_uris.go +++ b/internal/db/bundb/migrations/20220827085121_assign_missing_in_reply_to_uris.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220830014732_regenerate_indexes_for_follows.go b/internal/db/bundb/migrations/20220830014732_regenerate_indexes_for_follows.go index ff618878f..fd8ab66c0 100644 --- a/internal/db/bundb/migrations/20220830014732_regenerate_indexes_for_follows.go +++ b/internal/db/bundb/migrations/20220830014732_regenerate_indexes_for_follows.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20220905150505_custom_emoji_updates.go b/internal/db/bundb/migrations/20220905150505_custom_emoji_updates.go index 1d2f764fc..5767ceca8 100644 --- a/internal/db/bundb/migrations/20220905150505_custom_emoji_updates.go +++ b/internal/db/bundb/migrations/20220905150505_custom_emoji_updates.go @@ -21,7 +21,7 @@ import ( "context" "database/sql" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20220916122701_emojis_in_accounts.go b/internal/db/bundb/migrations/20220916122701_emojis_in_accounts.go index ef533f57b..0c19a8135 100644 --- a/internal/db/bundb/migrations/20220916122701_emojis_in_accounts.go +++ b/internal/db/bundb/migrations/20220916122701_emojis_in_accounts.go @@ -20,8 +20,8 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20220926115233_indexes.go b/internal/db/bundb/migrations/20220926115233_indexes.go index 1fecb3bac..b565eb85a 100644 --- a/internal/db/bundb/migrations/20220926115233_indexes.go +++ b/internal/db/bundb/migrations/20220926115233_indexes.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20221011125732_refetch_updated_emojis.go b/internal/db/bundb/migrations/20221011125732_refetch_updated_emojis.go index 60756579a..bcac19045 100644 --- a/internal/db/bundb/migrations/20221011125732_refetch_updated_emojis.go +++ b/internal/db/bundb/migrations/20221011125732_refetch_updated_emojis.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20221031145649_emoji_categories.go b/internal/db/bundb/migrations/20221031145649_emoji_categories.go index bdec3bd6e..5d1bb1d57 100644 --- a/internal/db/bundb/migrations/20221031145649_emoji_categories.go +++ b/internal/db/bundb/migrations/20221031145649_emoji_categories.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20221108142419_create_account_tombstones.go b/internal/db/bundb/migrations/20221108142419_create_account_tombstones.go index a08b83244..6d3619b2c 100644 --- a/internal/db/bundb/migrations/20221108142419_create_account_tombstones.go +++ b/internal/db/bundb/migrations/20221108142419_create_account_tombstones.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230105171144_report_model.go b/internal/db/bundb/migrations/20230105171144_report_model.go index 44b80727c..7a51fbcf7 100644 --- a/internal/db/bundb/migrations/20230105171144_report_model.go +++ b/internal/db/bundb/migrations/20230105171144_report_model.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230221150957_status_pin_client_api.go b/internal/db/bundb/migrations/20230221150957_status_pin_client_api.go index 5c4d5218b..2ec53f321 100644 --- a/internal/db/bundb/migrations/20230221150957_status_pin_client_api.go +++ b/internal/db/bundb/migrations/20230221150957_status_pin_client_api.go @@ -21,7 +21,7 @@ import ( "context" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230328203024_migration_fix.go b/internal/db/bundb/migrations/20230328203024_migration_fix.go index 3b64fb618..2cbb3896d 100644 --- a/internal/db/bundb/migrations/20230328203024_migration_fix.go +++ b/internal/db/bundb/migrations/20230328203024_migration_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20230328203024_migration_fix" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20230328203024_migration_fix" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230405130021_status_fave_unique_constraints.go b/internal/db/bundb/migrations/20230405130021_status_fave_unique_constraints.go index c1d4ef2ac..e4c3f3a8a 100644 --- a/internal/db/bundb/migrations/20230405130021_status_fave_unique_constraints.go +++ b/internal/db/bundb/migrations/20230405130021_status_fave_unique_constraints.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230515173919_lists.go b/internal/db/bundb/migrations/20230515173919_lists.go index e0ea5c7b6..2f8bb3a88 100644 --- a/internal/db/bundb/migrations/20230515173919_lists.go +++ b/internal/db/bundb/migrations/20230515173919_lists.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix.go b/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix.go index efb9f6ce6..12020e69e 100644 --- a/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix.go +++ b/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20230521105850_emoji_empty_domain_fix" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20230620103932_search_updates.go b/internal/db/bundb/migrations/20230620103932_search_updates.go index 0e26069a8..98c92f5c2 100644 --- a/internal/db/bundb/migrations/20230620103932_search_updates.go +++ b/internal/db/bundb/migrations/20230620103932_search_updates.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230711214815_account_notes.go b/internal/db/bundb/migrations/20230711214815_account_notes.go index 49d60745b..a88b2827f 100644 --- a/internal/db/bundb/migrations/20230711214815_account_notes.go +++ b/internal/db/bundb/migrations/20230711214815_account_notes.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230713025939_markers_api.go b/internal/db/bundb/migrations/20230713025939_markers_api.go index b2ace6856..acb235f81 100644 --- a/internal/db/bundb/migrations/20230713025939_markers_api.go +++ b/internal/db/bundb/migrations/20230713025939_markers_api.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230815164500_rules_model.go b/internal/db/bundb/migrations/20230815164500_rules_model.go index 9b202ede9..579e56386 100644 --- a/internal/db/bundb/migrations/20230815164500_rules_model.go +++ b/internal/db/bundb/migrations/20230815164500_rules_model.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230821075342_attachment_cleanup_updates.go b/internal/db/bundb/migrations/20230821075342_attachment_cleanup_updates.go index 2ee0a0c7d..182459237 100644 --- a/internal/db/bundb/migrations/20230821075342_attachment_cleanup_updates.go +++ b/internal/db/bundb/migrations/20230821075342_attachment_cleanup_updates.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20230828101322_admin_action_locking.go b/internal/db/bundb/migrations/20230828101322_admin_action_locking.go index 29c29a747..0af01cfa4 100644 --- a/internal/db/bundb/migrations/20230828101322_admin_action_locking.go +++ b/internal/db/bundb/migrations/20230828101322_admin_action_locking.go @@ -22,9 +22,9 @@ import ( "github.com/uptrace/bun" - oldmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20220315160814_admin_account_actions" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + oldmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20220315160814_admin_account_actions" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func init() { diff --git a/internal/db/bundb/migrations/20230908083121_allowlist.go.go b/internal/db/bundb/migrations/20230908083121_allowlist.go.go index 2d86f8c03..0b3469680 100644 --- a/internal/db/bundb/migrations/20230908083121_allowlist.go.go +++ b/internal/db/bundb/migrations/20230908083121_allowlist.go.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20231002153327_add_status_polls.go b/internal/db/bundb/migrations/20231002153327_add_status_polls.go index 019a369d4..956bf9750 100644 --- a/internal/db/bundb/migrations/20231002153327_add_status_polls.go +++ b/internal/db/bundb/migrations/20231002153327_add_status_polls.go @@ -21,7 +21,7 @@ import ( "context" "strings" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20231002153327_add_status_polls" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20231002153327_add_status_polls" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20231016113235_mute_status_thread.go b/internal/db/bundb/migrations/20231016113235_mute_status_thread.go index c4a4a4fe7..44eed5c1d 100644 --- a/internal/db/bundb/migrations/20231016113235_mute_status_thread.go +++ b/internal/db/bundb/migrations/20231016113235_mute_status_thread.go @@ -21,8 +21,8 @@ import ( "context" "strings" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20231128140847_remove_duplicate_indices.go b/internal/db/bundb/migrations/20231128140847_remove_duplicate_indices.go index 673c45209..486a42229 100644 --- a/internal/db/bundb/migrations/20231128140847_remove_duplicate_indices.go +++ b/internal/db/bundb/migrations/20231128140847_remove_duplicate_indices.go @@ -21,7 +21,7 @@ import ( "context" "strings" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20231130103643_fix_index_whoopsie.go b/internal/db/bundb/migrations/20231130103643_fix_index_whoopsie.go index 3b0d6c6db..7bb4a3ec9 100644 --- a/internal/db/bundb/migrations/20231130103643_fix_index_whoopsie.go +++ b/internal/db/bundb/migrations/20231130103643_fix_index_whoopsie.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20231208152242_sqlite_analyze.go b/internal/db/bundb/migrations/20231208152242_sqlite_analyze.go index 94cd5632d..ea9a836ec 100644 --- a/internal/db/bundb/migrations/20231208152242_sqlite_analyze.go +++ b/internal/db/bundb/migrations/20231208152242_sqlite_analyze.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20231212144715_add_header_filters.go b/internal/db/bundb/migrations/20231212144715_add_header_filters.go index 2d671bf46..c7cda5224 100644 --- a/internal/db/bundb/migrations/20231212144715_add_header_filters.go +++ b/internal/db/bundb/migrations/20231212144715_add_header_filters.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240114112637_postgres_header_filter_fix.go b/internal/db/bundb/migrations/20240114112637_postgres_header_filter_fix.go index 92e19fe34..29a442196 100644 --- a/internal/db/bundb/migrations/20240114112637_postgres_header_filter_fix.go +++ b/internal/db/bundb/migrations/20240114112637_postgres_header_filter_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20240126064004_add_filters.go b/internal/db/bundb/migrations/20240126064004_add_filters.go index 3ea9ae63c..d7fd6a19c 100644 --- a/internal/db/bundb/migrations/20240126064004_add_filters.go +++ b/internal/db/bundb/migrations/20240126064004_add_filters.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20240126064004_add_filters" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20240126064004_add_filters" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240129170725_moved_to_also_known_as.go b/internal/db/bundb/migrations/20240129170725_moved_to_also_known_as.go index 9a2cabdfc..9cce031aa 100644 --- a/internal/db/bundb/migrations/20240129170725_moved_to_also_known_as.go +++ b/internal/db/bundb/migrations/20240129170725_moved_to_also_known_as.go @@ -21,7 +21,7 @@ import ( "context" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go b/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go index fb09d6b12..3b3518af6 100644 --- a/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go +++ b/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go @@ -20,8 +20,8 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go b/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go index 6df74fc4d..3529da20c 100644 --- a/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go +++ b/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go @@ -20,8 +20,8 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240318115336_account_settings.go b/internal/db/bundb/migrations/20240318115336_account_settings.go index 3bf58e21e..125698ed3 100644 --- a/internal/db/bundb/migrations/20240318115336_account_settings.go +++ b/internal/db/bundb/migrations/20240318115336_account_settings.go @@ -20,10 +20,10 @@ package migrations import ( "context" - oldgtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20230328203024_migration_fix" - newgtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20240318115336_account_settings" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + oldgtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20230328203024_migration_fix" + newgtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20240318115336_account_settings" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240401130338_sign_up.go b/internal/db/bundb/migrations/20240401130338_sign_up.go index 51317fd9f..deed272a9 100644 --- a/internal/db/bundb/migrations/20240401130338_sign_up.go +++ b/internal/db/bundb/migrations/20240401130338_sign_up.go @@ -21,7 +21,7 @@ import ( "context" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240414122348_account_stats_model.go b/internal/db/bundb/migrations/20240414122348_account_stats_model.go index 450ca04d4..bfa4268b7 100644 --- a/internal/db/bundb/migrations/20240414122348_account_stats_model.go +++ b/internal/db/bundb/migrations/20240414122348_account_stats_model.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240426122821_pageable_admin_accounts.go b/internal/db/bundb/migrations/20240426122821_pageable_admin_accounts.go index 00465cc85..872006cae 100644 --- a/internal/db/bundb/migrations/20240426122821_pageable_admin_accounts.go +++ b/internal/db/bundb/migrations/20240426122821_pageable_admin_accounts.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20240528071620_add_user_mutes.go b/internal/db/bundb/migrations/20240528071620_add_user_mutes.go index e92e4df5b..6f29b844e 100644 --- a/internal/db/bundb/migrations/20240528071620_add_user_mutes.go +++ b/internal/db/bundb/migrations/20240528071620_add_user_mutes.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240611190733_add_conversations.go b/internal/db/bundb/migrations/20240611190733_add_conversations.go index 25b226aff..59cc5b816 100644 --- a/internal/db/bundb/migrations/20240611190733_add_conversations.go +++ b/internal/db/bundb/migrations/20240611190733_add_conversations.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240613091853_drop_unused_media_columns.go b/internal/db/bundb/migrations/20240613091853_drop_unused_media_columns.go index e13845fd2..831b2c831 100644 --- a/internal/db/bundb/migrations/20240613091853_drop_unused_media_columns.go +++ b/internal/db/bundb/migrations/20240613091853_drop_unused_media_columns.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240617134210_add_worker_tasks_table.go b/internal/db/bundb/migrations/20240617134210_add_worker_tasks_table.go index 3b0ebcfd8..a099fd266 100644 --- a/internal/db/bundb/migrations/20240617134210_add_worker_tasks_table.go +++ b/internal/db/bundb/migrations/20240617134210_add_worker_tasks_table.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240620074530_interaction_policy.go b/internal/db/bundb/migrations/20240620074530_interaction_policy.go index 7678af7ed..33f2c184f 100644 --- a/internal/db/bundb/migrations/20240620074530_interaction_policy.go +++ b/internal/db/bundb/migrations/20240620074530_interaction_policy.go @@ -20,10 +20,10 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" - oldmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20240620074530_interaction_policy" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + oldmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20240620074530_interaction_policy" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240712005536_add_advanced_migrations.go b/internal/db/bundb/migrations/20240712005536_add_advanced_migrations.go index 183065285..f1c00b6dc 100644 --- a/internal/db/bundb/migrations/20240712005536_add_advanced_migrations.go +++ b/internal/db/bundb/migrations/20240712005536_add_advanced_migrations.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements.go b/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements.go index 9bf948bed..a3f3e1503 100644 --- a/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements.go +++ b/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements.go @@ -20,9 +20,9 @@ package migrations import ( "context" - old_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements" - new_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + old_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20240715204203_media_pipeline_improvements" + new_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240722222556_remove_boost_content.go b/internal/db/bundb/migrations/20240722222556_remove_boost_content.go index a7764e2f7..c8a0eaf82 100644 --- a/internal/db/bundb/migrations/20240722222556_remove_boost_content.go +++ b/internal/db/bundb/migrations/20240722222556_remove_boost_content.go @@ -20,8 +20,8 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240725211933_add_followed_tags.go b/internal/db/bundb/migrations/20240725211933_add_followed_tags.go index f86b7d070..037f9b260 100644 --- a/internal/db/bundb/migrations/20240725211933_add_followed_tags.go +++ b/internal/db/bundb/migrations/20240725211933_add_followed_tags.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go b/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go index a3fb8675e..391322f3e 100644 --- a/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go +++ b/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go @@ -20,8 +20,8 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go b/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go index d3c0f49a4..74276a6f5 100644 --- a/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go +++ b/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20240906144432_unauthed_visibility.go.go b/internal/db/bundb/migrations/20240906144432_unauthed_visibility.go.go index 473783790..4810a4fc3 100644 --- a/internal/db/bundb/migrations/20240906144432_unauthed_visibility.go.go +++ b/internal/db/bundb/migrations/20240906144432_unauthed_visibility.go.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241011115713_pending_approval_fix.go b/internal/db/bundb/migrations/20241011115713_pending_approval_fix.go index c6d3e288f..fae74a3e9 100644 --- a/internal/db/bundb/migrations/20241011115713_pending_approval_fix.go +++ b/internal/db/bundb/migrations/20241011115713_pending_approval_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241018151036_filter_unique_fix.go b/internal/db/bundb/migrations/20241018151036_filter_unique_fix.go index f2ead0b92..c8fc7ecb2 100644 --- a/internal/db/bundb/migrations/20241018151036_filter_unique_fix.go +++ b/internal/db/bundb/migrations/20241018151036_filter_unique_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude.go b/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude.go index 32485ec64..a5308a4ff 100644 --- a/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude.go +++ b/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_draft_exclude" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241113151042_remove_mention_updated_at.go b/internal/db/bundb/migrations/20241113151042_remove_mention_updated_at.go index ba6e0bd3a..7ecdbcb5d 100644 --- a/internal/db/bundb/migrations/20241113151042_remove_mention_updated_at.go +++ b/internal/db/bundb/migrations/20241113151042_remove_mention_updated_at.go @@ -20,8 +20,8 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241113152126_add_status_edits.go b/internal/db/bundb/migrations/20241113152126_add_status_edits.go index 5d4fb7b3e..64654ca30 100644 --- a/internal/db/bundb/migrations/20241113152126_add_status_edits.go +++ b/internal/db/bundb/migrations/20241113152126_add_status_edits.go @@ -21,8 +21,8 @@ import ( "context" "reflect" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241113152126_add_status_edits" - "github.com/superseriousbusiness/gotosocial/internal/log" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20241113152126_add_status_edits" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241113152126_add_status_edits/status.go b/internal/db/bundb/migrations/20241113152126_add_status_edits/status.go index 1b7d93f70..d9e1052a4 100644 --- a/internal/db/bundb/migrations/20241113152126_add_status_edits/status.go +++ b/internal/db/bundb/migrations/20241113152126_add_status_edits/status.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Status represents a user-created 'post' or 'status' in the database, either remote or local diff --git a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints.go b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints.go index 113958437..532178f25 100644 --- a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints.go +++ b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints.go @@ -20,10 +20,10 @@ package migrations import ( "context" - old_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints" - new_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + old_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints" + new_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/accountsettings.go b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/accountsettings.go index 9a9cfd8e1..7745f19b9 100644 --- a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/accountsettings.go +++ b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/accountsettings.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // AccountSettings models settings / preferences for a local, non-instance account. diff --git a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/notification.go b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/notification.go index 77166a35d..318649073 100644 --- a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/notification.go +++ b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/notification.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Notification models an alert/notification sent to an account about something like a reblog, like, new follow request, etc. diff --git a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/status.go b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/status.go index 38583c7fc..90f609d80 100644 --- a/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/status.go +++ b/internal/db/bundb/migrations/20241121121623_enum_strings_to_ints/status.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Status represents a user-created 'post' or 'status' in the database, either remote or local diff --git a/internal/db/bundb/migrations/20241124012635_add_vapid_key_pairs.go b/internal/db/bundb/migrations/20241124012635_add_vapid_key_pairs.go index c1a32f6be..02382e271 100644 --- a/internal/db/bundb/migrations/20241124012635_add_vapid_key_pairs.go +++ b/internal/db/bundb/migrations/20241124012635_add_vapid_key_pairs.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241124012636_add_web_push_subscriptions.go b/internal/db/bundb/migrations/20241124012636_add_web_push_subscriptions.go index 87d966903..c9b419c5c 100644 --- a/internal/db/bundb/migrations/20241124012636_add_web_push_subscriptions.go +++ b/internal/db/bundb/migrations/20241124012636_add_web_push_subscriptions.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20241203124608_remove_media_attachment_updated_at.go b/internal/db/bundb/migrations/20241203124608_remove_media_attachment_updated_at.go index 63e5d5f90..699f0c505 100644 --- a/internal/db/bundb/migrations/20241203124608_remove_media_attachment_updated_at.go +++ b/internal/db/bundb/migrations/20241203124608_remove_media_attachment_updated_at.go @@ -20,8 +20,8 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat.go b/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat.go index fa28c7ce3..8b362c96d 100644 --- a/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat.go +++ b/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat.go @@ -22,9 +22,9 @@ import ( "fmt" "reflect" - oldmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat" - newmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + oldmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250106114512_replace_statuses_updatedat_with_editedat" + newmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20250106165529_cleanup_dropped_edits.go b/internal/db/bundb/migrations/20250106165529_cleanup_dropped_edits.go index cdc5db632..bb98bd3e4 100644 --- a/internal/db/bundb/migrations/20250106165529_cleanup_dropped_edits.go +++ b/internal/db/bundb/migrations/20250106165529_cleanup_dropped_edits.go @@ -22,9 +22,9 @@ import ( "fmt" "slices" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go b/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go index 7d2bd085c..64473c814 100644 --- a/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go +++ b/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250119112746_domain_perm_sub_caching_tweaks.go b/internal/db/bundb/migrations/20250119112746_domain_perm_sub_caching_tweaks.go index c37e4aa7f..5023e0379 100644 --- a/internal/db/bundb/migrations/20250119112746_domain_perm_sub_caching_tweaks.go +++ b/internal/db/bundb/migrations/20250119112746_domain_perm_sub_caching_tweaks.go @@ -22,8 +22,8 @@ import ( "fmt" "reflect" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go b/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go index 5914c752a..6e9756e39 100644 --- a/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go +++ b/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go @@ -20,7 +20,7 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250126162825_top_level_mention_replies_fix.go b/internal/db/bundb/migrations/20250126162825_top_level_mention_replies_fix.go index 0b198f17b..5ca4a054b 100644 --- a/internal/db/bundb/migrations/20250126162825_top_level_mention_replies_fix.go +++ b/internal/db/bundb/migrations/20250126162825_top_level_mention_replies_fix.go @@ -20,8 +20,8 @@ package migrations import ( "context" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20250131184755_add_web_push_subscription_policy.go b/internal/db/bundb/migrations/20250131184755_add_web_push_subscription_policy.go index d833a669f..b849e850b 100644 --- a/internal/db/bundb/migrations/20250131184755_add_web_push_subscription_policy.go +++ b/internal/db/bundb/migrations/20250131184755_add_web_push_subscription_policy.go @@ -22,7 +22,7 @@ import ( "reflect" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/migrations/20250224105654_token_app_client_refactor.go b/internal/db/bundb/migrations/20250224105654_token_app_client_refactor.go index 4ceef0808..68fbbb151 100644 --- a/internal/db/bundb/migrations/20250224105654_token_app_client_refactor.go +++ b/internal/db/bundb/migrations/20250224105654_token_app_client_refactor.go @@ -20,10 +20,10 @@ package migrations import ( "context" - oldmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init" - newmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250224105654_token_app_client_refactor" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" + oldmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20211113114307_init" + newmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250224105654_token_app_client_refactor" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250226013442_add_status_content_type.go b/internal/db/bundb/migrations/20250226013442_add_status_content_type.go index ba9584ac2..684341ebc 100644 --- a/internal/db/bundb/migrations/20250226013442_add_status_content_type.go +++ b/internal/db/bundb/migrations/20250226013442_add_status_content_type.go @@ -21,7 +21,7 @@ import ( "context" "reflect" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250226013442_add_status_content_type" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250226013442_add_status_content_type" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250226013442_add_status_content_type/status.go b/internal/db/bundb/migrations/20250226013442_add_status_content_type/status.go index 93b747a62..cebf9cb85 100644 --- a/internal/db/bundb/migrations/20250226013442_add_status_content_type/status.go +++ b/internal/db/bundb/migrations/20250226013442_add_status_content_type/status.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Status represents a user-created 'post' or 'status' in the database, either remote or local diff --git a/internal/db/bundb/migrations/20250226013442_add_status_content_type/statusedit.go b/internal/db/bundb/migrations/20250226013442_add_status_content_type/statusedit.go index c69e6ea7a..01e14e61a 100644 --- a/internal/db/bundb/migrations/20250226013442_add_status_content_type/statusedit.go +++ b/internal/db/bundb/migrations/20250226013442_add_status_content_type/statusedit.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // StatusEdit represents a **historical** view of a Status diff --git a/internal/db/bundb/migrations/20250305205820_content_warning_fixes.go b/internal/db/bundb/migrations/20250305205820_content_warning_fixes.go index cf4de834c..4f6237026 100644 --- a/internal/db/bundb/migrations/20250305205820_content_warning_fixes.go +++ b/internal/db/bundb/migrations/20250305205820_content_warning_fixes.go @@ -22,8 +22,8 @@ import ( "fmt" "reflect" - newmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250305205820_content_warning_fixes" - "github.com/superseriousbusiness/gotosocial/internal/log" + newmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250305205820_content_warning_fixes" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250310094108_statuses_count_query_optimize.go b/internal/db/bundb/migrations/20250310094108_statuses_count_query_optimize.go index b20340f32..80ce409ce 100644 --- a/internal/db/bundb/migrations/20250310094108_statuses_count_query_optimize.go +++ b/internal/db/bundb/migrations/20250310094108_statuses_count_query_optimize.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250310144102_application_management.go b/internal/db/bundb/migrations/20250310144102_application_management.go index e20cd2921..3b5fb6a4d 100644 --- a/internal/db/bundb/migrations/20250310144102_application_management.go +++ b/internal/db/bundb/migrations/20250310144102_application_management.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/config" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250314120945_add_gallery_web_layout.go b/internal/db/bundb/migrations/20250314120945_add_gallery_web_layout.go index 64b133cd5..a2418ddf8 100644 --- a/internal/db/bundb/migrations/20250314120945_add_gallery_web_layout.go +++ b/internal/db/bundb/migrations/20250314120945_add_gallery_web_layout.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250318093828_statuses_public_timeline_reindex.go b/internal/db/bundb/migrations/20250318093828_statuses_public_timeline_reindex.go index f1f5b71b4..37bcc6ff9 100644 --- a/internal/db/bundb/migrations/20250318093828_statuses_public_timeline_reindex.go +++ b/internal/db/bundb/migrations/20250318093828_statuses_public_timeline_reindex.go @@ -20,7 +20,7 @@ package migrations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness.go b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness.go index acc37529d..6e753b569 100644 --- a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness.go +++ b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness.go @@ -23,11 +23,11 @@ import ( "fmt" "strings" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - new_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new" - old_gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + new_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new" + old_gtsmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" diff --git a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new/account.go b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new/account.go index 55fa7f1b4..0fb891813 100644 --- a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new/account.go +++ b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/new/account.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/common" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/common" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old/account.go b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old/account.go index a630805d4..549691c89 100644 --- a/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old/account.go +++ b/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/old/account.go @@ -21,7 +21,7 @@ import ( "crypto/rsa" "time" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/common" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250321131230_relax_account_uri_uniqueness/common" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/20250324173534_2fa.go b/internal/db/bundb/migrations/20250324173534_2fa.go index 64393ee94..b7bdcbeae 100644 --- a/internal/db/bundb/migrations/20250324173534_2fa.go +++ b/internal/db/bundb/migrations/20250324173534_2fa.go @@ -22,8 +22,8 @@ import ( "fmt" "reflect" - newmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20250324173534_2fa" - "github.com/superseriousbusiness/gotosocial/internal/log" + newmodel "code.superseriousbusiness.org/gotosocial/internal/db/bundb/migrations/20250324173534_2fa" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/migrations/util.go b/internal/db/bundb/migrations/util.go index b8a60417d..3219a8aa7 100644 --- a/internal/db/bundb/migrations/util.go +++ b/internal/db/bundb/migrations/util.go @@ -26,10 +26,10 @@ import ( "strconv" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/dialect/feature" diff --git a/internal/db/bundb/move.go b/internal/db/bundb/move.go index 23e5c6d27..0d0f24101 100644 --- a/internal/db/bundb/move.go +++ b/internal/db/bundb/move.go @@ -24,10 +24,10 @@ import ( "net/url" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/move_test.go b/internal/db/bundb/move_test.go index 1e1a0613f..c3e0dce3d 100644 --- a/internal/db/bundb/move_test.go +++ b/internal/db/bundb/move_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type MoveTestSuite struct { diff --git a/internal/db/bundb/notification.go b/internal/db/bundb/notification.go index d4f8799bd..77d4861b2 100644 --- a/internal/db/bundb/notification.go +++ b/internal/db/bundb/notification.go @@ -22,14 +22,14 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/notification_test.go b/internal/db/bundb/notification_test.go index 8cc778071..a6dcdd407 100644 --- a/internal/db/bundb/notification_test.go +++ b/internal/db/bundb/notification_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) func (suite *NotificationTestSuite) spamNotifs() { diff --git a/internal/db/bundb/poll.go b/internal/db/bundb/poll.go index d21945377..e0989e571 100644 --- a/internal/db/bundb/poll.go +++ b/internal/db/bundb/poll.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/poll_test.go b/internal/db/bundb/poll_test.go index 8af9295d9..04c8609e8 100644 --- a/internal/db/bundb/poll_test.go +++ b/internal/db/bundb/poll_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type PollTestSuite struct { diff --git a/internal/db/bundb/relationship.go b/internal/db/bundb/relationship.go index 69b91f161..c8dcd5a50 100644 --- a/internal/db/bundb/relationship.go +++ b/internal/db/bundb/relationship.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/relationship_block.go b/internal/db/bundb/relationship_block.go index 9578b0e3e..9724166df 100644 --- a/internal/db/bundb/relationship_block.go +++ b/internal/db/bundb/relationship_block.go @@ -22,12 +22,12 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/relationship_follow.go b/internal/db/bundb/relationship_follow.go index aea36f39c..f37efa94b 100644 --- a/internal/db/bundb/relationship_follow.go +++ b/internal/db/bundb/relationship_follow.go @@ -23,12 +23,12 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/relationship_follow_req.go b/internal/db/bundb/relationship_follow_req.go index f36d626ca..513f5abb0 100644 --- a/internal/db/bundb/relationship_follow_req.go +++ b/internal/db/bundb/relationship_follow_req.go @@ -23,12 +23,12 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/relationship_mute.go b/internal/db/bundb/relationship_mute.go index b7b7e109e..3b5601f49 100644 --- a/internal/db/bundb/relationship_mute.go +++ b/internal/db/bundb/relationship_mute.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/relationship_note.go b/internal/db/bundb/relationship_note.go index 5c75bcdd9..4f05f945a 100644 --- a/internal/db/bundb/relationship_note.go +++ b/internal/db/bundb/relationship_note.go @@ -21,9 +21,9 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/relationship_test.go b/internal/db/bundb/relationship_test.go index 7aa749c90..50f790a42 100644 --- a/internal/db/bundb/relationship_test.go +++ b/internal/db/bundb/relationship_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type RelationshipTestSuite struct { diff --git a/internal/db/bundb/report.go b/internal/db/bundb/report.go index 582584988..661cffc8d 100644 --- a/internal/db/bundb/report.go +++ b/internal/db/bundb/report.go @@ -23,13 +23,13 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/report_test.go b/internal/db/bundb/report_test.go index 57828890d..910a5c370 100644 --- a/internal/db/bundb/report_test.go +++ b/internal/db/bundb/report_test.go @@ -21,13 +21,13 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ReportTestSuite struct { diff --git a/internal/db/bundb/rule.go b/internal/db/bundb/rule.go index b20f869cf..774f603ff 100644 --- a/internal/db/bundb/rule.go +++ b/internal/db/bundb/rule.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/rule_test.go b/internal/db/bundb/rule_test.go index 822f92fca..deaf7c14c 100644 --- a/internal/db/bundb/rule_test.go +++ b/internal/db/bundb/rule_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" ) type RuleTestSuite struct { diff --git a/internal/db/bundb/search.go b/internal/db/bundb/search.go index e54cb78e7..0de0891b9 100644 --- a/internal/db/bundb/search.go +++ b/internal/db/bundb/search.go @@ -21,10 +21,10 @@ import ( "context" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/search_test.go b/internal/db/bundb/search_test.go index cf24b2881..5ce1a6064 100644 --- a/internal/db/bundb/search_test.go +++ b/internal/db/bundb/search_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" ) type SearchTestSuite struct { diff --git a/internal/db/bundb/session.go b/internal/db/bundb/session.go index 2177a57ae..1b06f18ee 100644 --- a/internal/db/bundb/session.go +++ b/internal/db/bundb/session.go @@ -22,8 +22,8 @@ import ( "crypto/rand" "io" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/sinbinstatus.go b/internal/db/bundb/sinbinstatus.go index dd2c17f67..c827a7040 100644 --- a/internal/db/bundb/sinbinstatus.go +++ b/internal/db/bundb/sinbinstatus.go @@ -22,9 +22,9 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go index 8383a9c01..f33362a3d 100644 --- a/internal/db/bundb/status.go +++ b/internal/db/bundb/status.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/status_test.go b/internal/db/bundb/status_test.go index b64177c32..982169b36 100644 --- a/internal/db/bundb/status_test.go +++ b/internal/db/bundb/status_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type StatusTestSuite struct { diff --git a/internal/db/bundb/statusbookmark.go b/internal/db/bundb/statusbookmark.go index 6cbd7f583..eebd4c10f 100644 --- a/internal/db/bundb/statusbookmark.go +++ b/internal/db/bundb/statusbookmark.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/statusbookmark_test.go b/internal/db/bundb/statusbookmark_test.go index 104b090fe..c2977fdfb 100644 --- a/internal/db/bundb/statusbookmark_test.go +++ b/internal/db/bundb/statusbookmark_test.go @@ -22,9 +22,9 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type StatusBookmarkTestSuite struct { diff --git a/internal/db/bundb/statusedit.go b/internal/db/bundb/statusedit.go index c932968fd..ed62c64f1 100644 --- a/internal/db/bundb/statusedit.go +++ b/internal/db/bundb/statusedit.go @@ -22,13 +22,13 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/statusedit_test.go b/internal/db/bundb/statusedit_test.go index b6a15e825..639e5ba9b 100644 --- a/internal/db/bundb/statusedit_test.go +++ b/internal/db/bundb/statusedit_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type StatusEditTestSuite struct { diff --git a/internal/db/bundb/statusfave.go b/internal/db/bundb/statusfave.go index c1fa375aa..e97c3751a 100644 --- a/internal/db/bundb/statusfave.go +++ b/internal/db/bundb/statusfave.go @@ -25,13 +25,13 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/statusfave_test.go b/internal/db/bundb/statusfave_test.go index 5d83369a6..88f10e146 100644 --- a/internal/db/bundb/statusfave_test.go +++ b/internal/db/bundb/statusfave_test.go @@ -22,9 +22,9 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type StatusFaveTestSuite struct { diff --git a/internal/db/bundb/tag.go b/internal/db/bundb/tag.go index dfb80e829..631e05f6c 100644 --- a/internal/db/bundb/tag.go +++ b/internal/db/bundb/tag.go @@ -23,12 +23,12 @@ import ( "slices" "strings" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/tag_test.go b/internal/db/bundb/tag_test.go index 3647c92de..62d6e8543 100644 --- a/internal/db/bundb/tag_test.go +++ b/internal/db/bundb/tag_test.go @@ -22,10 +22,10 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" ) type TagTestSuite struct { diff --git a/internal/db/bundb/thread.go b/internal/db/bundb/thread.go index 2b44b6fa5..cf2dbf924 100644 --- a/internal/db/bundb/thread.go +++ b/internal/db/bundb/thread.go @@ -21,9 +21,9 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/thread_test.go b/internal/db/bundb/thread_test.go index 4d14f73e2..d8b8d0b3b 100644 --- a/internal/db/bundb/thread_test.go +++ b/internal/db/bundb/thread_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ThreadTestSuite struct { diff --git a/internal/db/bundb/timeline.go b/internal/db/bundb/timeline.go index 8278de647..37144429e 100644 --- a/internal/db/bundb/timeline.go +++ b/internal/db/bundb/timeline.go @@ -22,12 +22,12 @@ import ( "errors" "slices" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/timeline_test.go b/internal/db/bundb/timeline_test.go index 9652df33a..8f3bbe23e 100644 --- a/internal/db/bundb/timeline_test.go +++ b/internal/db/bundb/timeline_test.go @@ -21,12 +21,12 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type TimelineTestSuite struct { diff --git a/internal/db/bundb/tombstone.go b/internal/db/bundb/tombstone.go index 773702323..4e31af4ec 100644 --- a/internal/db/bundb/tombstone.go +++ b/internal/db/bundb/tombstone.go @@ -20,9 +20,9 @@ package bundb import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/upsert.go b/internal/db/bundb/upsert.go index 4a6395179..9667766f4 100644 --- a/internal/db/bundb/upsert.go +++ b/internal/db/bundb/upsert.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/user.go b/internal/db/bundb/user.go index fc8effa91..2800a32e9 100644 --- a/internal/db/bundb/user.go +++ b/internal/db/bundb/user.go @@ -21,10 +21,10 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/user_test.go b/internal/db/bundb/user_test.go index 870a1af91..f5ece561d 100644 --- a/internal/db/bundb/user_test.go +++ b/internal/db/bundb/user_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type UserTestSuite struct { diff --git a/internal/db/bundb/util.go b/internal/db/bundb/util.go index c7a2b96c2..6c743ffe9 100644 --- a/internal/db/bundb/util.go +++ b/internal/db/bundb/util.go @@ -23,10 +23,10 @@ import ( "slices" "strings" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect" ) diff --git a/internal/db/bundb/webpush.go b/internal/db/bundb/webpush.go index c61209573..8d3510f30 100644 --- a/internal/db/bundb/webpush.go +++ b/internal/db/bundb/webpush.go @@ -21,12 +21,12 @@ import ( "context" "errors" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" webpushgo "github.com/SherClockHolmes/webpush-go" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" "github.com/uptrace/bun" ) diff --git a/internal/db/bundb/workertask.go b/internal/db/bundb/workertask.go index eec51530d..1ac0cb71b 100644 --- a/internal/db/bundb/workertask.go +++ b/internal/db/bundb/workertask.go @@ -21,7 +21,7 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/uptrace/bun" ) diff --git a/internal/db/conversation.go b/internal/db/conversation.go index 3d0b4213e..eaf76bcd7 100644 --- a/internal/db/conversation.go +++ b/internal/db/conversation.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) type Conversation interface { diff --git a/internal/db/domain.go b/internal/db/domain.go index 95a2f0755..0c1fb97b3 100644 --- a/internal/db/domain.go +++ b/internal/db/domain.go @@ -21,8 +21,8 @@ import ( "context" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Domain contains DB functions related to domains and domain blocks. diff --git a/internal/db/emoji.go b/internal/db/emoji.go index 26a881dbc..11a98de67 100644 --- a/internal/db/emoji.go +++ b/internal/db/emoji.go @@ -21,8 +21,8 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // EmojiAllDomains can be used as the `domain` value in a GetEmojis diff --git a/internal/db/filter.go b/internal/db/filter.go index eee61a99d..4962aa1de 100644 --- a/internal/db/filter.go +++ b/internal/db/filter.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Filter contains methods for creating, reading, updating, and deleting filters and their keyword and status entries. diff --git a/internal/db/headerfilter.go b/internal/db/headerfilter.go index 5fe8a5b17..4704f627f 100644 --- a/internal/db/headerfilter.go +++ b/internal/db/headerfilter.go @@ -21,7 +21,7 @@ import ( "context" "net/http" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type HeaderFilter interface { diff --git a/internal/db/instance.go b/internal/db/instance.go index 23a2fc8dc..9ac0a3439 100644 --- a/internal/db/instance.go +++ b/internal/db/instance.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Instance contains functions for instance-level actions (counting instance users etc.). diff --git a/internal/db/interaction.go b/internal/db/interaction.go index a3a3afde9..4e58e1db3 100644 --- a/internal/db/interaction.go +++ b/internal/db/interaction.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) type Interaction interface { diff --git a/internal/db/list.go b/internal/db/list.go index 2e74329f1..6234c995c 100644 --- a/internal/db/list.go +++ b/internal/db/list.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) type List interface { diff --git a/internal/db/marker.go b/internal/db/marker.go index 14502865b..803602a83 100644 --- a/internal/db/marker.go +++ b/internal/db/marker.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type Marker interface { diff --git a/internal/db/media.go b/internal/db/media.go index a41f8970a..a6b992b89 100644 --- a/internal/db/media.go +++ b/internal/db/media.go @@ -21,8 +21,8 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Media contains functions related to creating/getting/removing media attachments. diff --git a/internal/db/mention.go b/internal/db/mention.go index 994ec04b5..c76b3bc6b 100644 --- a/internal/db/mention.go +++ b/internal/db/mention.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Mention contains functions for getting/creating mentions in the database. diff --git a/internal/db/move.go b/internal/db/move.go index 42357627b..07a3019f3 100644 --- a/internal/db/move.go +++ b/internal/db/move.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type Move interface { diff --git a/internal/db/notification.go b/internal/db/notification.go index c608261dc..029a3bc62 100644 --- a/internal/db/notification.go +++ b/internal/db/notification.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Notification contains functions for creating and getting notifications. diff --git a/internal/db/poll.go b/internal/db/poll.go index 2b92bd4d7..6927db543 100644 --- a/internal/db/poll.go +++ b/internal/db/poll.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type Poll interface { diff --git a/internal/db/postgres/driver.go b/internal/db/postgres/driver.go index 994c9ffba..3fbd04c00 100644 --- a/internal/db/postgres/driver.go +++ b/internal/db/postgres/driver.go @@ -21,8 +21,8 @@ import ( "context" "database/sql/driver" + "code.superseriousbusiness.org/gotosocial/internal/db" pgx "github.com/jackc/pgx/v5/stdlib" - "github.com/superseriousbusiness/gotosocial/internal/db" ) var ( diff --git a/internal/db/postgres/errors.go b/internal/db/postgres/errors.go index cb8989a73..0c614599c 100644 --- a/internal/db/postgres/errors.go +++ b/internal/db/postgres/errors.go @@ -20,8 +20,8 @@ package postgres import ( "fmt" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/jackc/pgx/v5/pgconn" - "github.com/superseriousbusiness/gotosocial/internal/db" ) // processPostgresError processes an error, replacing any diff --git a/internal/db/relationship.go b/internal/db/relationship.go index e121f07bd..b63e911e6 100644 --- a/internal/db/relationship.go +++ b/internal/db/relationship.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Relationship contains functions for getting or modifying the relationship between two accounts. diff --git a/internal/db/report.go b/internal/db/report.go index 605d6d80b..396d96050 100644 --- a/internal/db/report.go +++ b/internal/db/report.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Report handles getting/creation/deletion/updating of user reports/flags. diff --git a/internal/db/rule.go b/internal/db/rule.go index 651b8bced..eea6d4903 100644 --- a/internal/db/rule.go +++ b/internal/db/rule.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Rule handles getting/creation/deletion/updating of instance rules. diff --git a/internal/db/search.go b/internal/db/search.go index bdfd3a8e6..abe1bd70f 100644 --- a/internal/db/search.go +++ b/internal/db/search.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type Search interface { diff --git a/internal/db/session.go b/internal/db/session.go index 944fa4215..0f7a50807 100644 --- a/internal/db/session.go +++ b/internal/db/session.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Session handles getting/creation of router sessions. diff --git a/internal/db/sinbinstatus.go b/internal/db/sinbinstatus.go index 16abcf8bd..ab1d94382 100644 --- a/internal/db/sinbinstatus.go +++ b/internal/db/sinbinstatus.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type SinBinStatus interface { diff --git a/internal/db/sqlite/driver.go b/internal/db/sqlite/driver.go index 203edaff3..2c384718d 100644 --- a/internal/db/sqlite/driver.go +++ b/internal/db/sqlite/driver.go @@ -23,7 +23,7 @@ import ( "context" "database/sql/driver" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" sqlite3driver "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" // embed wasm binary diff --git a/internal/db/sqlite/driver_moderncsqlite3.go b/internal/db/sqlite/driver_moderncsqlite3.go index 2ba11cea4..5f01f10e8 100644 --- a/internal/db/sqlite/driver_moderncsqlite3.go +++ b/internal/db/sqlite/driver_moderncsqlite3.go @@ -25,7 +25,7 @@ import ( "modernc.org/sqlite" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" ) // Driver is our own wrapper around the diff --git a/internal/db/sqlite/errors.go b/internal/db/sqlite/errors.go index 9429a1bcd..4f986aaf4 100644 --- a/internal/db/sqlite/errors.go +++ b/internal/db/sqlite/errors.go @@ -23,8 +23,8 @@ import ( "database/sql/driver" "fmt" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/ncruces/go-sqlite3" - "github.com/superseriousbusiness/gotosocial/internal/db" ) // processSQLiteError processes an sqlite3.Error to diff --git a/internal/db/sqlite/errors_moderncsqlite3.go b/internal/db/sqlite/errors_moderncsqlite3.go index c490f514e..c01d0a3ae 100644 --- a/internal/db/sqlite/errors_moderncsqlite3.go +++ b/internal/db/sqlite/errors_moderncsqlite3.go @@ -26,7 +26,7 @@ import ( "modernc.org/sqlite" sqlite3 "modernc.org/sqlite/lib" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" ) // processSQLiteError processes an sqlite3.Error to diff --git a/internal/db/status.go b/internal/db/status.go index 6bf9653c8..adb31d391 100644 --- a/internal/db/status.go +++ b/internal/db/status.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Status contains functions for getting statuses, creating statuses, and checking various other fields on statuses. diff --git a/internal/db/statusbookmark.go b/internal/db/statusbookmark.go index d16bbcd7c..8e222caba 100644 --- a/internal/db/statusbookmark.go +++ b/internal/db/statusbookmark.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type StatusBookmark interface { diff --git a/internal/db/statusedit.go b/internal/db/statusedit.go index 32e770fb9..c25275c59 100644 --- a/internal/db/statusedit.go +++ b/internal/db/statusedit.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type StatusEdit interface { diff --git a/internal/db/statusfave.go b/internal/db/statusfave.go index 192ef436b..5c701bffb 100644 --- a/internal/db/statusfave.go +++ b/internal/db/statusfave.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type StatusFave interface { diff --git a/internal/db/tag.go b/internal/db/tag.go index 66c880e86..300d0b528 100644 --- a/internal/db/tag.go +++ b/internal/db/tag.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Tag contains functions for getting/creating tags in the database. diff --git a/internal/db/test/conversation.go b/internal/db/test/conversation.go index 50bca5308..5f221e05e 100644 --- a/internal/db/test/conversation.go +++ b/internal/db/test/conversation.go @@ -22,11 +22,11 @@ import ( "crypto/rand" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/oklog/ulid" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type testSuite interface { diff --git a/internal/db/thread.go b/internal/db/thread.go index dd494167a..d285c8ba3 100644 --- a/internal/db/thread.go +++ b/internal/db/thread.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Thread contains functions for getting/creating diff --git a/internal/db/timeline.go b/internal/db/timeline.go index b97095246..8193fe316 100644 --- a/internal/db/timeline.go +++ b/internal/db/timeline.go @@ -20,8 +20,8 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Timeline contains functionality for retrieving home/public/faved etc timelines for an account. diff --git a/internal/db/tombstone.go b/internal/db/tombstone.go index 362b6747d..6a7fc2429 100644 --- a/internal/db/tombstone.go +++ b/internal/db/tombstone.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Tombstone contains functionality for storing + retrieving tombstones for remote AP Activities + Objects. diff --git a/internal/db/user.go b/internal/db/user.go index 28fa59130..c8f33ee44 100644 --- a/internal/db/user.go +++ b/internal/db/user.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // User contains functions related to user getting/setting/creation. diff --git a/internal/db/webpush.go b/internal/db/webpush.go index 22bf449de..04b281ce6 100644 --- a/internal/db/webpush.go +++ b/internal/db/webpush.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // WebPush contains functions related to Web Push notifications. diff --git a/internal/db/workertask.go b/internal/db/workertask.go index 0276f231a..ea16c4af1 100644 --- a/internal/db/workertask.go +++ b/internal/db/workertask.go @@ -20,7 +20,7 @@ package db import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type WorkerTask interface { diff --git a/internal/email/common.go b/internal/email/common.go index 68e3b429b..1d8a585ce 100644 --- a/internal/email/common.go +++ b/internal/email/common.go @@ -28,10 +28,10 @@ import ( "text/template" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/google/uuid" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" ) func (s *sender) sendTemplate(template string, subject string, data any, toAddresses ...string) error { diff --git a/internal/email/email_test.go b/internal/email/email_test.go index ce1ae177f..9087f7d09 100644 --- a/internal/email/email_test.go +++ b/internal/email/email_test.go @@ -21,10 +21,10 @@ import ( "regexp" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/testrig" ) type EmailTestSuite struct { diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go index bd9b1206e..2702b3a8b 100644 --- a/internal/email/noopsender.go +++ b/internal/email/noopsender.go @@ -21,8 +21,8 @@ import ( "bytes" "text/template" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // NewNoopSender returns a no-op email sender that will just execute the given sendCallback diff --git a/internal/email/sender.go b/internal/email/sender.go index 2bcc6086f..2c7c79256 100644 --- a/internal/email/sender.go +++ b/internal/email/sender.go @@ -22,7 +22,7 @@ import ( "net/smtp" "text/template" - "github.com/superseriousbusiness/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/config" ) // Sender contains functions for sending emails to instance users/new signups. diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go index 907dccd81..2355aaa03 100644 --- a/internal/federation/authenticate.go +++ b/internal/federation/authenticate.go @@ -30,15 +30,15 @@ import ( "code.superseriousbusiness.org/activity/streams" typepublickey "code.superseriousbusiness.org/activity/streams/impl/w3idsecurityv1/type_publickey" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "code.superseriousbusiness.org/httpsig" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" ) var ( diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 1a5bf2d0e..6c9afc665 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -25,17 +25,17 @@ import ( "time" "code.superseriousbusiness.org/activity/pub" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" errorsv2 "codeberg.org/gruf/go-errors/v2" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // accountFresh returns true if the given account is diff --git a/internal/federation/dereferencing/account_test.go b/internal/federation/dereferencing/account_test.go index 859461779..24ee16f82 100644 --- a/internal/federation/dereferencing/account_test.go +++ b/internal/federation/dereferencing/account_test.go @@ -33,13 +33,13 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountTestSuite struct { diff --git a/internal/federation/dereferencing/announce.go b/internal/federation/dereferencing/announce.go index eb949f159..5d83b48a9 100644 --- a/internal/federation/dereferencing/announce.go +++ b/internal/federation/dereferencing/announce.go @@ -22,11 +22,11 @@ import ( "errors" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // EnrichAnnounce enriches the given boost wrapper status diff --git a/internal/federation/dereferencing/authenticate.go b/internal/federation/dereferencing/authenticate.go index 7c5946202..db9e5ef71 100644 --- a/internal/federation/dereferencing/authenticate.go +++ b/internal/federation/dereferencing/authenticate.go @@ -20,7 +20,7 @@ package dereferencing import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // verifyAccountKeysOnUpdate verifies that account's public key hasn't changed on update from diff --git a/internal/federation/dereferencing/collection.go b/internal/federation/dereferencing/collection.go index 714af9832..9ba0aad2c 100644 --- a/internal/federation/dereferencing/collection.go +++ b/internal/federation/dereferencing/collection.go @@ -22,9 +22,9 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // dereferenceCollectionPage returns the activitystreams Collection at the specified IRI, or an error if something goes wrong. diff --git a/internal/federation/dereferencing/dereferencer.go b/internal/federation/dereferencing/dereferencer.go index 5e7b2b9c0..94e0cf053 100644 --- a/internal/federation/dereferencing/dereferencer.go +++ b/internal/federation/dereferencing/dereferencer.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // FreshnessWindow represents a duration in which a diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go index bd1bf50f1..46ecd46da 100644 --- a/internal/federation/dereferencing/dereferencer_test.go +++ b/internal/federation/dereferencing/dereferencer_test.go @@ -19,18 +19,18 @@ package dereferencing_test import ( "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type DereferencerStandardTestSuite struct { diff --git a/internal/federation/dereferencing/emoji.go b/internal/federation/dereferencing/emoji.go index 0a117f762..fbe2e4d98 100644 --- a/internal/federation/dereferencing/emoji.go +++ b/internal/federation/dereferencing/emoji.go @@ -23,13 +23,13 @@ import ( "io" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // GetEmoji fetches the emoji with given shortcode, diff --git a/internal/federation/dereferencing/emoji_test.go b/internal/federation/dereferencing/emoji_test.go index 12965207c..3c77d5108 100644 --- a/internal/federation/dereferencing/emoji_test.go +++ b/internal/federation/dereferencing/emoji_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/media" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/media" ) type EmojiTestSuite struct { diff --git a/internal/federation/dereferencing/finger.go b/internal/federation/dereferencing/finger.go index d11950a1e..f0f79aee3 100644 --- a/internal/federation/dereferencing/finger.go +++ b/internal/federation/dereferencing/finger.go @@ -22,12 +22,12 @@ import ( "encoding/json" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // fingerRemoteAccount performs a webfinger call for the diff --git a/internal/federation/dereferencing/instance.go b/internal/federation/dereferencing/instance.go index 66d0a21be..0a1caedb2 100644 --- a/internal/federation/dereferencing/instance.go +++ b/internal/federation/dereferencing/instance.go @@ -21,8 +21,8 @@ import ( "context" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (d *Dereferencer) GetRemoteInstance(ctx context.Context, username string, remoteInstanceURI *url.URL) (*gtsmodel.Instance, error) { diff --git a/internal/federation/dereferencing/instance_test.go b/internal/federation/dereferencing/instance_test.go index c07490d4b..614e49035 100644 --- a/internal/federation/dereferencing/instance_test.go +++ b/internal/federation/dereferencing/instance_test.go @@ -22,9 +22,9 @@ import ( "net/url" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InstanceTestSuite struct { diff --git a/internal/federation/dereferencing/media.go b/internal/federation/dereferencing/media.go index 7fc9f9aef..776279572 100644 --- a/internal/federation/dereferencing/media.go +++ b/internal/federation/dereferencing/media.go @@ -22,11 +22,11 @@ import ( "io" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // GetMedia fetches the media at given remote URL by diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go index 17202b035..d238842e8 100644 --- a/internal/federation/dereferencing/status.go +++ b/internal/federation/dereferencing/status.go @@ -25,17 +25,17 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) // statusFresh returns true if the given status is still diff --git a/internal/federation/dereferencing/status_permitted.go b/internal/federation/dereferencing/status_permitted.go index 86d391a59..65251ed55 100644 --- a/internal/federation/dereferencing/status_permitted.go +++ b/internal/federation/dereferencing/status_permitted.go @@ -23,15 +23,15 @@ import ( "net/url" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // isPermittedStatus returns whether the given status diff --git a/internal/federation/dereferencing/status_test.go b/internal/federation/dereferencing/status_test.go index 817afbe3b..6f9ee9359 100644 --- a/internal/federation/dereferencing/status_test.go +++ b/internal/federation/dereferencing/status_test.go @@ -24,13 +24,13 @@ import ( "time" "code.superseriousbusiness.org/activity/streams" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) // instantFreshness is the shortest possible freshness window. diff --git a/internal/federation/dereferencing/thread.go b/internal/federation/dereferencing/thread.go index 76c6dfcc3..f9d6adb99 100644 --- a/internal/federation/dereferencing/thread.go +++ b/internal/federation/dereferencing/thread.go @@ -23,12 +23,12 @@ import ( "net/url" "code.superseriousbusiness.org/activity/pub" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // maxIter defines how many iterations of descendants or diff --git a/internal/federation/dereferencing/util.go b/internal/federation/dereferencing/util.go index 208117660..fa7c9a9ae 100644 --- a/internal/federation/dereferencing/util.go +++ b/internal/federation/dereferencing/util.go @@ -20,7 +20,7 @@ package dereferencing import ( "slices" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // getEmojiByShortcodeDomain searches input slice diff --git a/internal/federation/federatingactor.go b/internal/federation/federatingactor.go index e05f7e9ac..56bc0a416 100644 --- a/internal/federation/federatingactor.go +++ b/internal/federation/federatingactor.go @@ -27,15 +27,15 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" errorsv2 "codeberg.org/gruf/go-errors/v2" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) // federatingActor wraps the pub.FederatingActor diff --git a/internal/federation/federatingactor_test.go b/internal/federation/federatingactor_test.go index af12b409a..c08ddcbcf 100644 --- a/internal/federation/federatingactor_test.go +++ b/internal/federation/federatingactor_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FederatingActorTestSuite struct { diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go index 45c0a1920..273b9255f 100644 --- a/internal/federation/federatingdb/accept.go +++ b/internal/federation/federatingdb/accept.go @@ -24,15 +24,15 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (f *federatingDB) GetAccept( diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go index 654b036e4..2d467ea8c 100644 --- a/internal/federation/federatingdb/announce.go +++ b/internal/federation/federatingdb/announce.go @@ -23,10 +23,10 @@ import ( "slices" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStreamsAnnounce) error { diff --git a/internal/federation/federatingdb/announce_test.go b/internal/federation/federatingdb/announce_test.go index cda53bd9c..efb8c2381 100644 --- a/internal/federation/federatingdb/announce_test.go +++ b/internal/federation/federatingdb/announce_test.go @@ -22,10 +22,10 @@ import ( "time" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" ) type AnnounceTestSuite struct { diff --git a/internal/federation/federatingdb/block.go b/internal/federation/federatingdb/block.go index 501ee1cfb..54da2030a 100644 --- a/internal/federation/federatingdb/block.go +++ b/internal/federation/federatingdb/block.go @@ -22,11 +22,11 @@ import ( "net/http" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Block(ctx context.Context, blockable vocab.ActivityStreamsBlock) error { diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go index 368c7b1e4..2cfbb1d4c 100644 --- a/internal/federation/federatingdb/create.go +++ b/internal/federation/federatingdb/create.go @@ -23,14 +23,14 @@ import ( "slices" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // Create adds a new entry to the database which must be able to be diff --git a/internal/federation/federatingdb/create_test.go b/internal/federation/federatingdb/create_test.go index 9e6410095..2061c6be1 100644 --- a/internal/federation/federatingdb/create_test.go +++ b/internal/federation/federatingdb/create_test.go @@ -25,11 +25,11 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type CreateTestSuite struct { diff --git a/internal/federation/federatingdb/db.go b/internal/federation/federatingdb/db.go index 30aa38f6a..539305204 100644 --- a/internal/federation/federatingdb/db.go +++ b/internal/federation/federatingdb/db.go @@ -23,13 +23,13 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/spam" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "codeberg.org/gruf/go-cache/v3/simple" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/spam" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) // DB wraps the pub.Database interface with diff --git a/internal/federation/federatingdb/delete.go b/internal/federation/federatingdb/delete.go index c628bd2d1..fb967fce9 100644 --- a/internal/federation/federatingdb/delete.go +++ b/internal/federation/federatingdb/delete.go @@ -22,12 +22,12 @@ import ( "errors" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // Delete removes the entry with the given id. diff --git a/internal/federation/federatingdb/federatingdb_test.go b/internal/federation/federatingdb/federatingdb_test.go index a67abe762..e36c31d79 100644 --- a/internal/federation/federatingdb/federatingdb_test.go +++ b/internal/federation/federatingdb/federatingdb_test.go @@ -21,16 +21,16 @@ import ( "context" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/federatingdb" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FederatingDBTestSuite struct { diff --git a/internal/federation/federatingdb/flag.go b/internal/federation/federatingdb/flag.go index cbb046d50..1198e688a 100644 --- a/internal/federation/federatingdb/flag.go +++ b/internal/federation/federatingdb/flag.go @@ -22,12 +22,12 @@ import ( "net/http" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" "github.com/miekg/dns" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" ) func (f *federatingDB) Flag(ctx context.Context, flaggable vocab.ActivityStreamsFlag) error { diff --git a/internal/federation/federatingdb/follow.go b/internal/federation/federatingdb/follow.go index 9494503c4..f8ae8c580 100644 --- a/internal/federation/federatingdb/follow.go +++ b/internal/federation/federatingdb/follow.go @@ -22,11 +22,11 @@ import ( "net/http" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Follow(ctx context.Context, followable vocab.ActivityStreamsFollow) error { diff --git a/internal/federation/federatingdb/followers.go b/internal/federation/federatingdb/followers.go index f3f3320c1..4f8aaf459 100644 --- a/internal/federation/federatingdb/followers.go +++ b/internal/federation/federatingdb/followers.go @@ -23,7 +23,7 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // Followers obtains the Followers Collection for an actor with the diff --git a/internal/federation/federatingdb/followers_test.go b/internal/federation/federatingdb/followers_test.go index f6297ec8c..2c40c0a8c 100644 --- a/internal/federation/federatingdb/followers_test.go +++ b/internal/federation/federatingdb/followers_test.go @@ -22,9 +22,9 @@ import ( "encoding/json" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FollowersTestSuite struct { diff --git a/internal/federation/federatingdb/following.go b/internal/federation/federatingdb/following.go index bcbcf9533..6f65930bc 100644 --- a/internal/federation/federatingdb/following.go +++ b/internal/federation/federatingdb/following.go @@ -22,7 +22,7 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // Following obtains the Following Collection for an actor with the diff --git a/internal/federation/federatingdb/following_test.go b/internal/federation/federatingdb/following_test.go index 83d1a72b5..ff8c11160 100644 --- a/internal/federation/federatingdb/following_test.go +++ b/internal/federation/federatingdb/following_test.go @@ -22,9 +22,9 @@ import ( "encoding/json" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FollowingTestSuite struct { diff --git a/internal/federation/federatingdb/get.go b/internal/federation/federatingdb/get.go index e1e61e916..10e7dae8c 100644 --- a/internal/federation/federatingdb/get.go +++ b/internal/federation/federatingdb/get.go @@ -23,8 +23,8 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // Get returns the database entry for the specified id. diff --git a/internal/federation/federatingdb/inbox.go b/internal/federation/federatingdb/inbox.go index e5b10f596..2fb0ebad9 100644 --- a/internal/federation/federatingdb/inbox.go +++ b/internal/federation/federatingdb/inbox.go @@ -24,9 +24,9 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // InboxContains returns true if the OrderedCollection at 'inbox' diff --git a/internal/federation/federatingdb/inbox_test.go b/internal/federation/federatingdb/inbox_test.go index 36595ce04..d8c308a10 100644 --- a/internal/federation/federatingdb/inbox_test.go +++ b/internal/federation/federatingdb/inbox_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InboxTestSuite struct { diff --git a/internal/federation/federatingdb/like.go b/internal/federation/federatingdb/like.go index 119958750..76ae19a52 100644 --- a/internal/federation/federatingdb/like.go +++ b/internal/federation/federatingdb/like.go @@ -23,12 +23,12 @@ import ( "net/http" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Like(ctx context.Context, likeable vocab.ActivityStreamsLike) error { diff --git a/internal/federation/federatingdb/move.go b/internal/federation/federatingdb/move.go index 0c88cd3f4..2740d0de9 100644 --- a/internal/federation/federatingdb/move.go +++ b/internal/federation/federatingdb/move.go @@ -28,11 +28,11 @@ import ( "fmt" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Move(ctx context.Context, move vocab.ActivityStreamsMove) error { diff --git a/internal/federation/federatingdb/move_test.go b/internal/federation/federatingdb/move_test.go index 65e97be70..38a869f15 100644 --- a/internal/federation/federatingdb/move_test.go +++ b/internal/federation/federatingdb/move_test.go @@ -24,9 +24,9 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type MoveTestSuite struct { diff --git a/internal/federation/federatingdb/owns.go b/internal/federation/federatingdb/owns.go index 3da41dd61..7d08a877f 100644 --- a/internal/federation/federatingdb/owns.go +++ b/internal/federation/federatingdb/owns.go @@ -23,12 +23,12 @@ import ( "fmt" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // Owns returns true if the IRI belongs to this instance, and if diff --git a/internal/federation/federatingdb/reject.go b/internal/federation/federatingdb/reject.go index 138aa6b22..1c657a5a9 100644 --- a/internal/federation/federatingdb/reject.go +++ b/internal/federation/federatingdb/reject.go @@ -23,14 +23,14 @@ import ( "time" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsReject) error { diff --git a/internal/federation/federatingdb/reject_test.go b/internal/federation/federatingdb/reject_test.go index cca7c6498..28a46eaad 100644 --- a/internal/federation/federatingdb/reject_test.go +++ b/internal/federation/federatingdb/reject_test.go @@ -22,12 +22,12 @@ import ( "time" "code.superseriousbusiness.org/activity/streams" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RejectTestSuite struct { diff --git a/internal/federation/federatingdb/undo.go b/internal/federation/federatingdb/undo.go index 6233c9de3..5f3678cd8 100644 --- a/internal/federation/federatingdb/undo.go +++ b/internal/federation/federatingdb/undo.go @@ -23,13 +23,13 @@ import ( "fmt" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error { diff --git a/internal/federation/federatingdb/update.go b/internal/federation/federatingdb/update.go index f6f126efa..94471c33a 100644 --- a/internal/federation/federatingdb/update.go +++ b/internal/federation/federatingdb/update.go @@ -22,13 +22,13 @@ import ( "errors" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // Update sets an existing entry to the database based on the value's diff --git a/internal/federation/federatingdb/util.go b/internal/federation/federatingdb/util.go index b9f9a7529..32aec51a5 100644 --- a/internal/federation/federatingdb/util.go +++ b/internal/federation/federatingdb/util.go @@ -25,14 +25,14 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) func typeNames(objects []ap.TypeOrIRI) []string { diff --git a/internal/federation/federatingprotocol.go b/internal/federation/federatingprotocol.go index 82b39606e..60ee48eaa 100644 --- a/internal/federation/federatingprotocol.go +++ b/internal/federation/federatingprotocol.go @@ -27,15 +27,15 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" ) type errOtherIRIBlocked struct { diff --git a/internal/federation/federatingprotocol_test.go b/internal/federation/federatingprotocol_test.go index 08c7fcd8f..fa4950d82 100644 --- a/internal/federation/federatingprotocol_test.go +++ b/internal/federation/federatingprotocol_test.go @@ -27,14 +27,14 @@ import ( "net/url" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "code.superseriousbusiness.org/httpsig" errorsv2 "codeberg.org/gruf/go-errors/v2" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FederatingProtocolTestSuite struct { diff --git a/internal/federation/federator.go b/internal/federation/federator.go index 08d346137..93df31735 100644 --- a/internal/federation/federator.go +++ b/internal/federation/federator.go @@ -19,15 +19,15 @@ package federation import ( "code.superseriousbusiness.org/activity/pub" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/federation/federatingdb" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) var _ interface { diff --git a/internal/federation/federator_test.go b/internal/federation/federator_test.go index 7ea0432a1..5c07cfa85 100644 --- a/internal/federation/federator_test.go +++ b/internal/federation/federator_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" ) type FederatorStandardTestSuite struct { diff --git a/internal/federation/gone.go b/internal/federation/gone.go index e0278765c..932bd17a1 100644 --- a/internal/federation/gone.go +++ b/internal/federation/gone.go @@ -21,8 +21,8 @@ import ( "context" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // CheckGone checks if a tombstone exists in the database for AP Actor or Object with the given uri. diff --git a/internal/federation/transport.go b/internal/federation/transport.go index 471a454ca..040e7364d 100644 --- a/internal/federation/transport.go +++ b/internal/federation/transport.go @@ -23,7 +23,7 @@ import ( "net/url" "code.superseriousbusiness.org/activity/pub" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // NewTransport returns a new Transport on behalf of a specific actor. diff --git a/internal/filter/interaction/filter.go b/internal/filter/interaction/filter.go index 49e0758c1..e2dffce82 100644 --- a/internal/filter/interaction/filter.go +++ b/internal/filter/interaction/filter.go @@ -18,7 +18,7 @@ package interaction import ( - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/state" ) // Filter packages up logic for checking whether diff --git a/internal/filter/interaction/interactable.go b/internal/filter/interaction/interactable.go index 4d0882068..e8afbd83c 100644 --- a/internal/filter/interaction/interactable.go +++ b/internal/filter/interaction/interactable.go @@ -22,11 +22,11 @@ import ( "fmt" "slices" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) type matchType int diff --git a/internal/filter/spam/spam.go b/internal/filter/spam/spam.go index 386c2719b..00767dacc 100644 --- a/internal/filter/spam/spam.go +++ b/internal/filter/spam/spam.go @@ -17,7 +17,7 @@ package spam -import "github.com/superseriousbusiness/gotosocial/internal/state" +import "code.superseriousbusiness.org/gotosocial/internal/state" // Filter packages logic for checking whether // given statuses should be considered spam. diff --git a/internal/filter/spam/spam_test.go b/internal/filter/spam/spam_test.go index d9d867a07..84ab34b1d 100644 --- a/internal/filter/spam/spam_test.go +++ b/internal/filter/spam/spam_test.go @@ -18,12 +18,12 @@ package spam_test import ( + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/spam" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/spam" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FilterStandardTestSuite struct { diff --git a/internal/filter/spam/statusable.go b/internal/filter/spam/statusable.go index 4fbd6d780..e50753738 100644 --- a/internal/filter/spam/statusable.go +++ b/internal/filter/spam/statusable.go @@ -24,16 +24,16 @@ import ( "slices" "strings" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/miekg/dns" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // preppedMention represents a partially-parsed diff --git a/internal/filter/spam/statusable_test.go b/internal/filter/spam/statusable_test.go index f59f09328..7d710416f 100644 --- a/internal/filter/spam/statusable_test.go +++ b/internal/filter/spam/statusable_test.go @@ -23,11 +23,11 @@ import ( "io" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" ) type StatusableTestSuite struct { diff --git a/internal/filter/usermute/usermute.go b/internal/filter/usermute/usermute.go index 6d710e995..d8d1aae46 100644 --- a/internal/filter/usermute/usermute.go +++ b/internal/filter/usermute/usermute.go @@ -20,8 +20,8 @@ package usermute import ( "time" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type compiledUserMuteListEntry struct { diff --git a/internal/filter/visibility/account.go b/internal/filter/visibility/account.go index ebbbe4a2f..f13de723d 100644 --- a/internal/filter/visibility/account.go +++ b/internal/filter/visibility/account.go @@ -20,11 +20,11 @@ package visibility import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // AccountVisible will check if given account is visible to requester, accounting for requester with no auth (i.e is nil), suspensions, disabled local users and account blocks. diff --git a/internal/filter/visibility/filter.go b/internal/filter/visibility/filter.go index 43f862681..b17127aa3 100644 --- a/internal/filter/visibility/filter.go +++ b/internal/filter/visibility/filter.go @@ -18,7 +18,7 @@ package visibility import ( - "github.com/superseriousbusiness/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/state" ) // NoAuth is a placeholder ID used in cache lookups diff --git a/internal/filter/visibility/filter_test.go b/internal/filter/visibility/filter_test.go index ccd60f173..48b1df2e5 100644 --- a/internal/filter/visibility/filter_test.go +++ b/internal/filter/visibility/filter_test.go @@ -18,12 +18,12 @@ package visibility_test import ( + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FilterStandardTestSuite struct { diff --git a/internal/filter/visibility/home_timeline.go b/internal/filter/visibility/home_timeline.go index 37348e71d..03a3b62c3 100644 --- a/internal/filter/visibility/home_timeline.go +++ b/internal/filter/visibility/home_timeline.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // StatusHomeTimelineable checks if given status should be included on owner's home timeline. Primarily relying on status visibility to owner and the AP visibility setting, but also taking into account thread replies etc. diff --git a/internal/filter/visibility/home_timeline_test.go b/internal/filter/visibility/home_timeline_test.go index f33ad3999..084da42a0 100644 --- a/internal/filter/visibility/home_timeline_test.go +++ b/internal/filter/visibility/home_timeline_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusStatusHomeTimelineableTestSuite struct { diff --git a/internal/filter/visibility/public_timeline.go b/internal/filter/visibility/public_timeline.go index 9cc3c2357..83c250dee 100644 --- a/internal/filter/visibility/public_timeline.go +++ b/internal/filter/visibility/public_timeline.go @@ -21,11 +21,11 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // StatusHomeTimelineable checks if given status should be included on requester's public timeline. Primarily relying on status visibility to requester and the AP visibility setting, and ignoring conversation threads. diff --git a/internal/filter/visibility/status.go b/internal/filter/visibility/status.go index a0f971464..6edb32ec0 100644 --- a/internal/filter/visibility/status.go +++ b/internal/filter/visibility/status.go @@ -21,11 +21,11 @@ import ( "context" "slices" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // StatusesVisible calls StatusVisible for each status in the statuses slice, and returns a slice of only statuses which are visible to the requester. diff --git a/internal/filter/visibility/status_test.go b/internal/filter/visibility/status_test.go index 795441e7f..d7442089c 100644 --- a/internal/filter/visibility/status_test.go +++ b/internal/filter/visibility/status_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type StatusVisibleTestSuite struct { diff --git a/internal/filter/visibility/tag_timeline.go b/internal/filter/visibility/tag_timeline.go index b2c9dbf29..0d0860e36 100644 --- a/internal/filter/visibility/tag_timeline.go +++ b/internal/filter/visibility/tag_timeline.go @@ -21,8 +21,8 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // StatusHomeTimelineable checks if given status should be included diff --git a/internal/gtscontext/context.go b/internal/gtscontext/context.go index 985361a98..39d7efe95 100644 --- a/internal/gtscontext/context.go +++ b/internal/gtscontext/context.go @@ -22,8 +22,8 @@ import ( "net/http" "net/url" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "code.superseriousbusiness.org/httpsig" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // package private context key type. diff --git a/internal/gtscontext/log_hooks.go b/internal/gtscontext/log_hooks.go index 494ce1f63..3e8b166ff 100644 --- a/internal/gtscontext/log_hooks.go +++ b/internal/gtscontext/log_hooks.go @@ -20,8 +20,8 @@ package gtscontext import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/log" ) func init() { diff --git a/internal/gtserror/multi_test.go b/internal/gtserror/multi_test.go index b58c1b881..a2996222b 100644 --- a/internal/gtserror/multi_test.go +++ b/internal/gtserror/multi_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) func TestMultiError(t *testing.T) { diff --git a/internal/gtserror/new_test.go b/internal/gtserror/new_test.go index 8b4dae1ba..9b30b5809 100644 --- a/internal/gtserror/new_test.go +++ b/internal/gtserror/new_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" ) func TestResponseError(t *testing.T) { diff --git a/internal/gtsmodel/account.go b/internal/gtsmodel/account.go index c2ab1c9a4..664f1f66a 100644 --- a/internal/gtsmodel/account.go +++ b/internal/gtsmodel/account.go @@ -27,8 +27,8 @@ import ( "strings" "time" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // Account represents either a local or a remote ActivityPub actor. diff --git a/internal/gtsmodel/conversation.go b/internal/gtsmodel/conversation.go index d3bdcbf1d..56a999686 100644 --- a/internal/gtsmodel/conversation.go +++ b/internal/gtsmodel/conversation.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) // Conversation represents direct messages between the owner account and a set of other accounts. diff --git a/internal/gtsmodel/domainpermissionexclude.go b/internal/gtsmodel/domainpermissionexclude.go index 10492a5c1..6ce549f52 100644 --- a/internal/gtsmodel/domainpermissionexclude.go +++ b/internal/gtsmodel/domainpermissionexclude.go @@ -20,7 +20,7 @@ package gtsmodel import ( "time" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // DomainPermissionExclude represents one domain that should be excluded diff --git a/internal/gtsmodel/filter.go b/internal/gtsmodel/filter.go index 593918ec1..36ebc8391 100644 --- a/internal/gtsmodel/filter.go +++ b/internal/gtsmodel/filter.go @@ -21,7 +21,7 @@ import ( "regexp" "time" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Filter stores a filter created by a local account. diff --git a/internal/gtsmodel/status.go b/internal/gtsmodel/status.go index 62458c2db..a7d917f78 100644 --- a/internal/gtsmodel/status.go +++ b/internal/gtsmodel/status.go @@ -21,8 +21,8 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) // Status represents a user-created 'post' or 'status' in the database, either remote or local diff --git a/internal/httpclient/client.go b/internal/httpclient/client.go index 445c6a9e5..bc93205d3 100644 --- a/internal/httpclient/client.go +++ b/internal/httpclient/client.go @@ -31,12 +31,12 @@ import ( "strings" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-cache/v3" errorsv2 "codeberg.org/gruf/go-errors/v2" "codeberg.org/gruf/go-iotools" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) var ( diff --git a/internal/httpclient/client_test.go b/internal/httpclient/client_test.go index 2e36a6e90..e94644da8 100644 --- a/internal/httpclient/client_test.go +++ b/internal/httpclient/client_test.go @@ -26,7 +26,7 @@ import ( "net/netip" "testing" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" ) var privateIPs = []string{ diff --git a/internal/httpclient/request.go b/internal/httpclient/request.go index 853563945..39b0b253c 100644 --- a/internal/httpclient/request.go +++ b/internal/httpclient/request.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" ) const ( diff --git a/internal/httpclient/sanitizer_test.go b/internal/httpclient/sanitizer_test.go index 1cb8a7d2e..1c292b779 100644 --- a/internal/httpclient/sanitizer_test.go +++ b/internal/httpclient/sanitizer_test.go @@ -22,7 +22,7 @@ import ( "net/netip" "testing" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" ) func TestSafeIP(t *testing.T) { diff --git a/internal/httpclient/transport.go b/internal/httpclient/transport.go index 350d24fab..a92c1ab0d 100644 --- a/internal/httpclient/transport.go +++ b/internal/httpclient/transport.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" ) // SignFunc is a function signature that provides request signing. diff --git a/internal/id/page.go b/internal/id/page.go index b43ccd4e2..193c2735d 100644 --- a/internal/id/page.go +++ b/internal/id/page.go @@ -18,7 +18,7 @@ package id import ( - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // ValidatePage ensures that passed page has valid paging diff --git a/internal/id/ulid.go b/internal/id/ulid.go index 3c57c9f1b..b281ef5b8 100644 --- a/internal/id/ulid.go +++ b/internal/id/ulid.go @@ -22,9 +22,9 @@ import ( "math/big" "time" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-kv" "github.com/oklog/ulid" - "github.com/superseriousbusiness/gotosocial/internal/log" ) const ( diff --git a/internal/language/language.go b/internal/language/language.go index d91e3a4db..233ae5a1d 100644 --- a/internal/language/language.go +++ b/internal/language/language.go @@ -18,7 +18,7 @@ package language import ( - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "golang.org/x/text/language" "golang.org/x/text/language/display" ) diff --git a/internal/language/language_test.go b/internal/language/language_test.go index 024448ab4..1f41a0b6d 100644 --- a/internal/language/language_test.go +++ b/internal/language/language_test.go @@ -21,7 +21,7 @@ import ( "slices" "testing" - "github.com/superseriousbusiness/gotosocial/internal/language" + "code.superseriousbusiness.org/gotosocial/internal/language" golanguage "golang.org/x/text/language" ) diff --git a/internal/log/log.go b/internal/log/log.go index 52703ef28..bf2259b50 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -25,8 +25,8 @@ import ( "strings" "time" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" ) var ( diff --git a/internal/log/syslog_test.go b/internal/log/syslog_test.go index 354c81556..66d9367ad 100644 --- a/internal/log/syslog_test.go +++ b/internal/log/syslog_test.go @@ -22,10 +22,10 @@ import ( "regexp" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/testrig" "gopkg.in/mcuadros/go-syslog.v2" "gopkg.in/mcuadros/go-syslog.v2/format" ) diff --git a/internal/log/sysloglongunixgram_test.go b/internal/log/sysloglongunixgram_test.go index e64a9fef9..6f180df7e 100644 --- a/internal/log/sysloglongunixgram_test.go +++ b/internal/log/sysloglongunixgram_test.go @@ -25,10 +25,10 @@ import ( "path" "regexp" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/google/uuid" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/testrig" ) // TestSyslogLongMessageUnixgram is known to hang on macOS for messages longer than about 1500 bytes. diff --git a/internal/media/ffmpeg.go b/internal/media/ffmpeg.go index 6bf39cae2..41cc2666f 100644 --- a/internal/media/ffmpeg.go +++ b/internal/media/ffmpeg.go @@ -28,10 +28,10 @@ import ( "codeberg.org/gruf/go-byteutil" - _ffmpeg "github.com/superseriousbusiness/gotosocial/internal/media/ffmpeg" + _ffmpeg "code.superseriousbusiness.org/gotosocial/internal/media/ffmpeg" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/tetratelabs/wazero" ) diff --git a/internal/media/ffmpeg/wasm.go b/internal/media/ffmpeg/wasm.go index 51735bec1..1cd92f05d 100644 --- a/internal/media/ffmpeg/wasm.go +++ b/internal/media/ffmpeg/wasm.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "unsafe" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-ffmpreg/embed" "codeberg.org/gruf/go-ffmpreg/wasm" - "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/tetratelabs/wazero" "golang.org/x/sys/cpu" ) diff --git a/internal/media/manager.go b/internal/media/manager.go index 6d9c5629f..a7bd8948b 100644 --- a/internal/media/manager.go +++ b/internal/media/manager.go @@ -23,15 +23,15 @@ import ( "strings" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-iotools" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" ) var SupportedMIMETypes = []string{ diff --git a/internal/media/manager_test.go b/internal/media/manager_test.go index 5b6882100..8497c1c9e 100644 --- a/internal/media/manager_test.go +++ b/internal/media/manager_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + gtsstorage "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "codeberg.org/gruf/go-iotools" "codeberg.org/gruf/go-storage/disk" "github.com/stretchr/testify/suite" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - gtsstorage "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ManagerTestSuite struct { diff --git a/internal/media/media_test.go b/internal/media/media_test.go index e6175642b..43836b1c3 100644 --- a/internal/media/media_test.go +++ b/internal/media/media_test.go @@ -18,15 +18,15 @@ package media_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + gtsmodel "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaStandardTestSuite struct { diff --git a/internal/media/metadata.go b/internal/media/metadata.go index 458ad00e2..44b1a87b6 100644 --- a/internal/media/metadata.go +++ b/internal/media/metadata.go @@ -23,8 +23,8 @@ import ( "strings" terminator "code.superseriousbusiness.org/exif-terminator" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // clearMetadata performs our best-attempt at cleaning metadata from diff --git a/internal/media/probe.go b/internal/media/probe.go index 882a2981d..791b6a8c2 100644 --- a/internal/media/probe.go +++ b/internal/media/probe.go @@ -25,9 +25,9 @@ import ( "os" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) const ( diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 95c224cda..d28edcc0c 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -21,14 +21,14 @@ import ( "context" "os" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" errorsv2 "codeberg.org/gruf/go-errors/v2" "codeberg.org/gruf/go-runners" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // ProcessingEmoji represents an emoji currently processing. It exposes diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index 894975a1b..a1305f104 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -25,12 +25,12 @@ import ( "codeberg.org/gruf/go-kv" "codeberg.org/gruf/go-runners" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // ProcessingMedia represents a piece of media diff --git a/internal/media/refetch.go b/internal/media/refetch.go index c467333c9..94e0a5338 100644 --- a/internal/media/refetch.go +++ b/internal/media/refetch.go @@ -24,10 +24,10 @@ import ( "io" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) type DereferenceMedia func(ctx context.Context, iri *url.URL, maxsz int64) (io.ReadCloser, error) diff --git a/internal/media/thumbnail.go b/internal/media/thumbnail.go index f1c7c678e..56247bc33 100644 --- a/internal/media/thumbnail.go +++ b/internal/media/thumbnail.go @@ -27,9 +27,9 @@ import ( "os" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/buckket/go-blurhash" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" "golang.org/x/image/webp" ) diff --git a/internal/media/util.go b/internal/media/util.go index 4e47955ad..ea52b415b 100644 --- a/internal/media/util.go +++ b/internal/media/util.go @@ -25,9 +25,9 @@ import ( "os" "path" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-iotools" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // file represents one file diff --git a/internal/messages/messages.go b/internal/messages/messages.go index 8abc714aa..6744adfc9 100644 --- a/internal/messages/messages.go +++ b/internal/messages/messages.go @@ -25,9 +25,9 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) // FromClientAPI wraps a message that diff --git a/internal/messages/messages_test.go b/internal/messages/messages_test.go index e5b2a2841..8492edbff 100644 --- a/internal/messages/messages_test.go +++ b/internal/messages/messages_test.go @@ -23,10 +23,10 @@ import ( "net/url" "testing" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/testrig" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/google/go-cmp/cmp" ) diff --git a/internal/middleware/contentsecuritypolicy_test.go b/internal/middleware/contentsecuritypolicy_test.go index fad05931b..a337763df 100644 --- a/internal/middleware/contentsecuritypolicy_test.go +++ b/internal/middleware/contentsecuritypolicy_test.go @@ -20,7 +20,7 @@ package middleware_test import ( "testing" - "github.com/superseriousbusiness/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/middleware" ) func TestBuildContentSecurityPolicy(t *testing.T) { diff --git a/internal/middleware/headerfilter.go b/internal/middleware/headerfilter.go index 5a17a8a71..6fb9fc996 100644 --- a/internal/middleware/headerfilter.go +++ b/internal/middleware/headerfilter.go @@ -20,12 +20,12 @@ package middleware import ( "errors" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/headerfilter" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/headerfilter" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" ) var ( diff --git a/internal/middleware/headerfilter_test.go b/internal/middleware/headerfilter_test.go index a28644153..4ad40b86f 100644 --- a/internal/middleware/headerfilter_test.go +++ b/internal/middleware/headerfilter_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/headerfilter" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/headerfilter" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) func TestHeaderFilter(t *testing.T) { diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index da5be9dfa..9fa245666 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -23,13 +23,13 @@ import ( "runtime" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-errors/v2" "codeberg.org/gruf/go-kv" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) // Logger returns a gin middleware which provides request logging and panic recovery. diff --git a/internal/middleware/ratelimit.go b/internal/middleware/ratelimit.go index a259cd575..6d39721ec 100644 --- a/internal/middleware/ratelimit.go +++ b/internal/middleware/ratelimit.go @@ -24,13 +24,13 @@ import ( "strconv" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" "github.com/ulule/limiter/v3" "github.com/ulule/limiter/v3/drivers/store/memory" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" ) const rateLimitPeriod = 5 * time.Minute diff --git a/internal/middleware/ratelimit_test.go b/internal/middleware/ratelimit_test.go index e5afd40a6..d3a3722eb 100644 --- a/internal/middleware/ratelimit_test.go +++ b/internal/middleware/ratelimit_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type RateLimitTestSuite struct { diff --git a/internal/middleware/requestid.go b/internal/middleware/requestid.go index 7d98787a7..96551be01 100644 --- a/internal/middleware/requestid.go +++ b/internal/middleware/requestid.go @@ -26,8 +26,8 @@ import ( "sync" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" ) var ( diff --git a/internal/middleware/robots.go b/internal/middleware/robots.go index fefd93be0..24dcb68b8 100644 --- a/internal/middleware/robots.go +++ b/internal/middleware/robots.go @@ -18,8 +18,8 @@ package middleware import ( + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // RobotsHeaders adds robots directives to the X-Robots-Tag HTTP header. diff --git a/internal/middleware/session.go b/internal/middleware/session.go index 9f96ff055..50433002a 100644 --- a/internal/middleware/session.go +++ b/internal/middleware/session.go @@ -23,11 +23,11 @@ import ( "net/url" "strings" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/memstore" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" "golang.org/x/net/idna" ) diff --git a/internal/middleware/session_test.go b/internal/middleware/session_test.go index 210f44d86..78370a9e0 100644 --- a/internal/middleware/session_test.go +++ b/internal/middleware/session_test.go @@ -20,10 +20,10 @@ package middleware_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/testrig" ) type SessionTestSuite struct { diff --git a/internal/middleware/signaturecheck.go b/internal/middleware/signaturecheck.go index fd89cd886..5ee09e675 100644 --- a/internal/middleware/signaturecheck.go +++ b/internal/middleware/signaturecheck.go @@ -22,8 +22,8 @@ import ( "net/http" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/log" "code.superseriousbusiness.org/httpsig" "github.com/gin-gonic/gin" diff --git a/internal/middleware/throttling.go b/internal/middleware/throttling.go index 739189b79..f0a2067a5 100644 --- a/internal/middleware/throttling.go +++ b/internal/middleware/throttling.go @@ -34,7 +34,7 @@ import ( "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" ) // token represents a request that is being processed. diff --git a/internal/middleware/throttling_test.go b/internal/middleware/throttling_test.go index 4610ee63b..1e18eee5b 100644 --- a/internal/middleware/throttling_test.go +++ b/internal/middleware/throttling_test.go @@ -34,8 +34,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/middleware" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/middleware" ) func TestThrottlingMiddleware(t *testing.T) { diff --git a/internal/middleware/tokencheck.go b/internal/middleware/tokencheck.go index e06aa08c7..cc82e6e2f 100644 --- a/internal/middleware/tokencheck.go +++ b/internal/middleware/tokencheck.go @@ -20,11 +20,11 @@ package middleware import ( "net/http" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "code.superseriousbusiness.org/oauth2/v4" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) // TokenCheck returns a new gin middleware for validating oauth tokens in requests. diff --git a/internal/middleware/useragent.go b/internal/middleware/useragent.go index 38d28f4e5..21740378b 100644 --- a/internal/middleware/useragent.go +++ b/internal/middleware/useragent.go @@ -20,8 +20,8 @@ package middleware import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // UserAgent returns a gin middleware which aborts requests with diff --git a/internal/middleware/util.go b/internal/middleware/util.go index 82850fd6d..530cd11a9 100644 --- a/internal/middleware/util.go +++ b/internal/middleware/util.go @@ -20,8 +20,8 @@ package middleware import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" ) // respondBlocked responds to the given gin context with diff --git a/internal/oauth/clientstore.go b/internal/oauth/clientstore.go index 77e18bd07..f780e13d5 100644 --- a/internal/oauth/clientstore.go +++ b/internal/oauth/clientstore.go @@ -20,9 +20,9 @@ package oauth import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/state" "code.superseriousbusiness.org/oauth2/v4" "code.superseriousbusiness.org/oauth2/v4/errors" - "github.com/superseriousbusiness/gotosocial/internal/state" ) type clientStore struct { diff --git a/internal/oauth/clientstore_test.go b/internal/oauth/clientstore_test.go index c6621186a..73e070002 100644 --- a/internal/oauth/clientstore_test.go +++ b/internal/oauth/clientstore_test.go @@ -21,13 +21,13 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ClientStoreTestSuite struct { diff --git a/internal/oauth/handlers/handlers.go b/internal/oauth/handlers/handlers.go index df83cd548..b2a0045ec 100644 --- a/internal/oauth/handlers/handlers.go +++ b/internal/oauth/handlers/handlers.go @@ -25,16 +25,16 @@ import ( "slices" "strings" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" "code.superseriousbusiness.org/oauth2/v4" oautherr "code.superseriousbusiness.org/oauth2/v4/errors" "code.superseriousbusiness.org/oauth2/v4/manage" "code.superseriousbusiness.org/oauth2/v4/server" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" ) // GetClientScopeHandler returns a handler for testing scope on a TokenGenerateRequest. diff --git a/internal/oauth/server.go b/internal/oauth/server.go index 4f08818b5..05e8cad44 100644 --- a/internal/oauth/server.go +++ b/internal/oauth/server.go @@ -24,17 +24,17 @@ import ( "net/http" "strings" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" "code.superseriousbusiness.org/oauth2/v4" oautherr "code.superseriousbusiness.org/oauth2/v4/errors" "code.superseriousbusiness.org/oauth2/v4/manage" "code.superseriousbusiness.org/oauth2/v4/server" errorsv2 "codeberg.org/gruf/go-errors/v2" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" ) const ( diff --git a/internal/oauth/tokenstore.go b/internal/oauth/tokenstore.go index 87bde5504..add478039 100644 --- a/internal/oauth/tokenstore.go +++ b/internal/oauth/tokenstore.go @@ -22,14 +22,14 @@ import ( "errors" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" "code.superseriousbusiness.org/oauth2/v4" "code.superseriousbusiness.org/oauth2/v4/models" "codeberg.org/gruf/go-mutexes" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" ) // tokenStore is an implementation of oauth2.TokenStore, which uses our db interface as a storage backend. diff --git a/internal/observability/metrics.go b/internal/observability/metrics.go index f2ff2ac0d..97ddd088f 100644 --- a/internal/observability/metrics.go +++ b/internal/observability/metrics.go @@ -23,8 +23,8 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/gin-gonic/gin" "github.com/technologize/otel-go-contrib/otelginmetrics" diff --git a/internal/observability/no_otel.go b/internal/observability/no_otel.go index 122d7a897..f1d0589bb 100644 --- a/internal/observability/no_otel.go +++ b/internal/observability/no_otel.go @@ -20,7 +20,7 @@ package observability import ( - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/gin-gonic/gin" "github.com/uptrace/bun" diff --git a/internal/observability/tracing.go b/internal/observability/tracing.go index 7827004a3..65fd1ac11 100644 --- a/internal/observability/tracing.go +++ b/internal/observability/tracing.go @@ -36,14 +36,14 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.24.0" oteltrace "go.opentelemetry.io/otel/trace" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/log" ) const ( tracerKey = "gotosocial-server-tracer" - tracerName = "github.com/superseriousbusiness/gotosocial/internal/observability" + tracerName = "code.superseriousbusiness.org/gotosocial/internal/observability" ) func InitializeTracing() error { diff --git a/internal/oidc/handlecallback.go b/internal/oidc/handlecallback.go index 870a81627..ef4efe2a9 100644 --- a/internal/oidc/handlecallback.go +++ b/internal/oidc/handlecallback.go @@ -22,8 +22,8 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" ) func (i *idp) HandleCallback(ctx context.Context, code string) (*Claims, gtserror.WithCode) { diff --git a/internal/oidc/idp.go b/internal/oidc/idp.go index 0b360da0a..381133de1 100644 --- a/internal/oidc/idp.go +++ b/internal/oidc/idp.go @@ -21,9 +21,9 @@ import ( "context" "fmt" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/coreos/go-oidc/v3/oidc" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" "golang.org/x/oauth2" ) diff --git a/internal/paging/page_test.go b/internal/paging/page_test.go index dcf727aec..0ee69504d 100644 --- a/internal/paging/page_test.go +++ b/internal/paging/page_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) type Case struct { diff --git a/internal/paging/parse.go b/internal/paging/parse.go index ce6391708..726288de7 100644 --- a/internal/paging/parse.go +++ b/internal/paging/parse.go @@ -20,8 +20,8 @@ package paging import ( "strconv" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) // ParseIDPage parses an ID Page from a request context, returning BadRequest on error parsing. diff --git a/internal/paging/response.go b/internal/paging/response.go index 71b0cf213..a832aa3df 100644 --- a/internal/paging/response.go +++ b/internal/paging/response.go @@ -21,8 +21,8 @@ import ( "net/url" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" ) // ResponseParams models the parameters to pass to PageableResponse. diff --git a/internal/paging/response_test.go b/internal/paging/response_test.go index b4b7d6058..73163088c 100644 --- a/internal/paging/response_test.go +++ b/internal/paging/response_test.go @@ -20,9 +20,9 @@ package paging_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/paging" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/paging" ) type PagingSuite struct { diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go index d65d7360c..1e8be372f 100644 --- a/internal/processing/account/account.go +++ b/internal/processing/account/account.go @@ -18,14 +18,14 @@ package account import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Processor wraps functionality for updating, creating, and deleting accounts in response to API requests. diff --git a/internal/processing/account/account_test.go b/internal/processing/account/account_test.go index 5b0c5f01e..5c80922e6 100644 --- a/internal/processing/account/account_test.go +++ b/internal/processing/account/account_test.go @@ -21,23 +21,23 @@ import ( "context" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountStandardTestSuite struct { diff --git a/internal/processing/account/alias.go b/internal/processing/account/alias.go index ca27a518c..01d4e0999 100644 --- a/internal/processing/account/alias.go +++ b/internal/processing/account/alias.go @@ -24,10 +24,10 @@ import ( "net/url" "slices" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) func (p *Processor) Alias( diff --git a/internal/processing/account/alias_test.go b/internal/processing/account/alias_test.go index 80fdb81c1..f3231cd74 100644 --- a/internal/processing/account/alias_test.go +++ b/internal/processing/account/alias_test.go @@ -22,8 +22,8 @@ import ( "slices" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type AliasTestSuite struct { diff --git a/internal/processing/account/block.go b/internal/processing/account/block.go index d3904bffa..21ec5eb07 100644 --- a/internal/processing/account/block.go +++ b/internal/processing/account/block.go @@ -22,17 +22,17 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // BlockCreate handles the creation of a block from requestingAccount to targetAccountID, either remote or local. diff --git a/internal/processing/account/bookmarks.go b/internal/processing/account/bookmarks.go index d64108d3a..7c7f7cb07 100644 --- a/internal/processing/account/bookmarks.go +++ b/internal/processing/account/bookmarks.go @@ -21,13 +21,13 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // BookmarksGet returns a pageable response of statuses that are bookmarked by requestingAccount. diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go index 2d3ef88de..46057707d 100644 --- a/internal/processing/account/delete.go +++ b/internal/processing/account/delete.go @@ -23,16 +23,16 @@ import ( "net" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-kv" "github.com/google/uuid" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/util" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/account/delete_test.go b/internal/processing/account/delete_test.go index 587071a11..fd19099c3 100644 --- a/internal/processing/account/delete_test.go +++ b/internal/processing/account/delete_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type AccountDeleteTestSuite struct { diff --git a/internal/processing/account/export.go b/internal/processing/account/export.go index 68cc17b6d..b36c0e75b 100644 --- a/internal/processing/account/export.go +++ b/internal/processing/account/export.go @@ -21,10 +21,10 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // ExportStats returns the requester's export stats, diff --git a/internal/processing/account/follow.go b/internal/processing/account/follow.go index 59de8834b..2c9b1be4e 100644 --- a/internal/processing/account/follow.go +++ b/internal/processing/account/follow.go @@ -21,16 +21,16 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // FollowCreate handles a follow request to an account, either remote or local. diff --git a/internal/processing/account/follow_request.go b/internal/processing/account/follow_request.go index 6f6c7ba2d..a1969ac23 100644 --- a/internal/processing/account/follow_request.go +++ b/internal/processing/account/follow_request.go @@ -21,13 +21,13 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // FollowRequestAccept handles the accepting of a follow request from the sourceAccountID to the requestingAccount (the currently authorized account). diff --git a/internal/processing/account/follow_test.go b/internal/processing/account/follow_test.go index 9ea8ce1b8..68653f329 100644 --- a/internal/processing/account/follow_test.go +++ b/internal/processing/account/follow_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type FollowTestSuite struct { diff --git a/internal/processing/account/get.go b/internal/processing/account/get.go index 33eb4c101..f7bf84961 100644 --- a/internal/processing/account/get.go +++ b/internal/processing/account/get.go @@ -22,12 +22,12 @@ import ( "errors" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // Get processes the given request for account information. diff --git a/internal/processing/account/import.go b/internal/processing/account/import.go index 5c830639a..f645662d3 100644 --- a/internal/processing/account/import.go +++ b/internal/processing/account/import.go @@ -24,10 +24,10 @@ import ( "fmt" "mime/multipart" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) func (p *Processor) ImportData( diff --git a/internal/processing/account/interactionpolicies.go b/internal/processing/account/interactionpolicies.go index e02b43e9e..405c92230 100644 --- a/internal/processing/account/interactionpolicies.go +++ b/internal/processing/account/interactionpolicies.go @@ -21,10 +21,10 @@ import ( "cmp" "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) func (p *Processor) DefaultInteractionPoliciesGet( diff --git a/internal/processing/account/lists.go b/internal/processing/account/lists.go index 04cf4ca73..be6c86d47 100644 --- a/internal/processing/account/lists.go +++ b/internal/processing/account/lists.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // ListsGet returns all lists owned by requestingAccount, which contain a follow for targetAccountID. diff --git a/internal/processing/account/move.go b/internal/processing/account/move.go index 734331503..58db5d452 100644 --- a/internal/processing/account/move.go +++ b/internal/processing/account/move.go @@ -25,18 +25,18 @@ import ( "slices" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/account/move_test.go b/internal/processing/account/move_test.go index 76cbe1512..54b016528 100644 --- a/internal/processing/account/move_test.go +++ b/internal/processing/account/move_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) type MoveTestSuite struct { diff --git a/internal/processing/account/mute.go b/internal/processing/account/mute.go index 00bb9dd22..43dc45497 100644 --- a/internal/processing/account/mute.go +++ b/internal/processing/account/mute.go @@ -22,14 +22,14 @@ import ( "errors" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // MuteCreate handles the creation or updating of a mute from requestingAccount to targetAccountID. diff --git a/internal/processing/account/note.go b/internal/processing/account/note.go index 7606c1a91..231bb2ed8 100644 --- a/internal/processing/account/note.go +++ b/internal/processing/account/note.go @@ -20,10 +20,10 @@ package account import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // PutNote updates the requesting account's private note on the target account. diff --git a/internal/processing/account/relationships.go b/internal/processing/account/relationships.go index 53d2ee3c7..6a82e67a4 100644 --- a/internal/processing/account/relationships.go +++ b/internal/processing/account/relationships.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // FollowersGet fetches a list of the target account's followers. diff --git a/internal/processing/account/rss.go b/internal/processing/account/rss.go index b0debcc91..495aa2e54 100644 --- a/internal/processing/account/rss.go +++ b/internal/processing/account/rss.go @@ -23,11 +23,11 @@ import ( "fmt" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/gorilla/feeds" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) const ( diff --git a/internal/processing/account/statuses.go b/internal/processing/account/statuses.go index 3b4e067f9..191fdcb5f 100644 --- a/internal/processing/account/statuses.go +++ b/internal/processing/account/statuses.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // StatusesGet fetches a number of statuses (in time descending order) from the diff --git a/internal/processing/account/themes.go b/internal/processing/account/themes.go index 4f8cc49a1..88fd3ff6c 100644 --- a/internal/processing/account/themes.go +++ b/internal/processing/account/themes.go @@ -25,11 +25,11 @@ import ( "slices" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-bytesize" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" ) var ( diff --git a/internal/processing/account/themes_test.go b/internal/processing/account/themes_test.go index 9506aee50..fff129f68 100644 --- a/internal/processing/account/themes_test.go +++ b/internal/processing/account/themes_test.go @@ -20,9 +20,9 @@ package account_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" ) type ThemesTestSuite struct { diff --git a/internal/processing/account/tokens.go b/internal/processing/account/tokens.go index dcd997839..eaeffe38b 100644 --- a/internal/processing/account/tokens.go +++ b/internal/processing/account/tokens.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) func (p *Processor) TokensGet( diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index 83a046a25..f0e3b790b 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -24,19 +24,19 @@ import ( "io" "mime/multipart" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" "codeberg.org/gruf/go-iotools" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) func (p *Processor) selectNoteFormatter(contentType string) text.FormatFunc { diff --git a/internal/processing/account/update_test.go b/internal/processing/account/update_test.go index 674502b75..52895a463 100644 --- a/internal/processing/account/update_test.go +++ b/internal/processing/account/update_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type AccountUpdateTestSuite struct { diff --git a/internal/processing/admin/account_test.go b/internal/processing/admin/account_test.go index baa6eb646..76c4c82f5 100644 --- a/internal/processing/admin/account_test.go +++ b/internal/processing/admin/account_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AccountTestSuite struct { diff --git a/internal/processing/admin/accountaction.go b/internal/processing/admin/accountaction.go index 959f2cfcd..19b04a145 100644 --- a/internal/processing/admin/accountaction.go +++ b/internal/processing/admin/accountaction.go @@ -21,12 +21,12 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (p *Processor) AccountAction( diff --git a/internal/processing/admin/accountget.go b/internal/processing/admin/accountget.go index 5a3c34c62..06a47cedc 100644 --- a/internal/processing/admin/accountget.go +++ b/internal/processing/admin/accountget.go @@ -22,9 +22,9 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) func (p *Processor) AccountGet(ctx context.Context, accountID string) (*apimodel.AdminAccountInfo, gtserror.WithCode) { diff --git a/internal/processing/admin/accounts.go b/internal/processing/admin/accounts.go index ba2a88ce6..2be71ddc3 100644 --- a/internal/processing/admin/accounts.go +++ b/internal/processing/admin/accounts.go @@ -25,12 +25,12 @@ import ( "net/url" "slices" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) var ( diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go index 08e6bf0d5..7ad2450de 100644 --- a/internal/processing/admin/admin.go +++ b/internal/processing/admin/admin.go @@ -18,15 +18,15 @@ package admin import ( - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/admin/admin_test.go b/internal/processing/admin/admin_test.go index 93f20d5e6..db46fb17f 100644 --- a/internal/processing/admin/admin_test.go +++ b/internal/processing/admin/admin_test.go @@ -18,26 +18,26 @@ package admin_test import ( + adminactions "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/processing/admin" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - adminactions "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/processing/admin" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AdminStandardTestSuite struct { diff --git a/internal/processing/admin/debug_apurl.go b/internal/processing/admin/debug_apurl.go index dbf337dc3..f6098c534 100644 --- a/internal/processing/admin/debug_apurl.go +++ b/internal/processing/admin/debug_apurl.go @@ -23,11 +23,11 @@ import ( "net/http" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // DebugAPUrl performs a GET to the given url, using the diff --git a/internal/processing/admin/domainallow.go b/internal/processing/admin/domainallow.go index 134351ad5..388ca5cb1 100644 --- a/internal/processing/admin/domainallow.go +++ b/internal/processing/admin/domainallow.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/text" ) func (p *Processor) createDomainAllow( diff --git a/internal/processing/admin/domainblock.go b/internal/processing/admin/domainblock.go index 3dd5a256f..1c5d004bd 100644 --- a/internal/processing/admin/domainblock.go +++ b/internal/processing/admin/domainblock.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/text" ) func (p *Processor) createDomainBlock( diff --git a/internal/processing/admin/domainkeysexpire.go b/internal/processing/admin/domainkeysexpire.go index 0613f502d..39fe77dc7 100644 --- a/internal/processing/admin/domainkeysexpire.go +++ b/internal/processing/admin/domainkeysexpire.go @@ -20,9 +20,9 @@ package admin import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // DomainKeysExpire iterates through all diff --git a/internal/processing/admin/domainpermission.go b/internal/processing/admin/domainpermission.go index 9b8c88030..d7546fb15 100644 --- a/internal/processing/admin/domainpermission.go +++ b/internal/processing/admin/domainpermission.go @@ -26,11 +26,11 @@ import ( "mime/multipart" "net/http" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // DomainPermissionCreate creates an instance-level permission diff --git a/internal/processing/admin/domainpermission_test.go b/internal/processing/admin/domainpermission_test.go index c8f3560c3..f53c241b6 100644 --- a/internal/processing/admin/domainpermission_test.go +++ b/internal/processing/admin/domainpermission_test.go @@ -22,13 +22,13 @@ import ( "net/http" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/testrig" ) type DomainBlockTestSuite struct { diff --git a/internal/processing/admin/domainpermissiondraft.go b/internal/processing/admin/domainpermissiondraft.go index 0dc17a45a..9e067f20b 100644 --- a/internal/processing/admin/domainpermissiondraft.go +++ b/internal/processing/admin/domainpermissiondraft.go @@ -23,16 +23,16 @@ import ( "fmt" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // DomainPermissionDraftGet returns one diff --git a/internal/processing/admin/domainpermissionexclude.go b/internal/processing/admin/domainpermissionexclude.go index 761ca8b9c..b2134777d 100644 --- a/internal/processing/admin/domainpermissionexclude.go +++ b/internal/processing/admin/domainpermissionexclude.go @@ -23,13 +23,13 @@ import ( "fmt" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) func (p *Processor) DomainPermissionExcludeCreate( diff --git a/internal/processing/admin/domainpermissionsubscription.go b/internal/processing/admin/domainpermissionsubscription.go index bdc38df63..b4dc72aa3 100644 --- a/internal/processing/admin/domainpermissionsubscription.go +++ b/internal/processing/admin/domainpermissionsubscription.go @@ -24,13 +24,13 @@ import ( "net/url" "slices" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // DomainPermissionSubscriptionGet returns one diff --git a/internal/processing/admin/email.go b/internal/processing/admin/email.go index 949be6e4b..fe69236db 100644 --- a/internal/processing/admin/email.go +++ b/internal/processing/admin/email.go @@ -21,10 +21,10 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // EmailTest sends a generic test email to the given diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go index 5a7da445e..b45d31e96 100644 --- a/internal/processing/admin/emoji.go +++ b/internal/processing/admin/emoji.go @@ -25,15 +25,15 @@ import ( "mime/multipart" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-iotools" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // EmojiCreate creates a custom emoji on this instance. diff --git a/internal/processing/admin/emoji_test.go b/internal/processing/admin/emoji_test.go index 17f5fc864..4968ad1af 100644 --- a/internal/processing/admin/emoji_test.go +++ b/internal/processing/admin/emoji_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type EmojiTestSuite struct { diff --git a/internal/processing/admin/headerfilter.go b/internal/processing/admin/headerfilter.go index 13105d191..dc74c151b 100644 --- a/internal/processing/admin/headerfilter.go +++ b/internal/processing/admin/headerfilter.go @@ -23,13 +23,13 @@ import ( "net/textproto" "regexp" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/headerfilter" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/headerfilter" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // GetAllowHeaderFilter fetches allow HTTP header filter with provided ID from the database. diff --git a/internal/processing/admin/media.go b/internal/processing/admin/media.go index 9cd68d88b..785ee0e98 100644 --- a/internal/processing/admin/media.go +++ b/internal/processing/admin/media.go @@ -21,10 +21,10 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // MediaRefetch forces a refetch of remote emojis. diff --git a/internal/processing/admin/report.go b/internal/processing/admin/report.go index ed34a4e83..bb94e67f5 100644 --- a/internal/processing/admin/report.go +++ b/internal/processing/admin/report.go @@ -25,14 +25,14 @@ import ( "strconv" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // ReportsGet returns reports stored on this diff --git a/internal/processing/admin/rule.go b/internal/processing/admin/rule.go index 8134c21cd..a665da9a1 100644 --- a/internal/processing/admin/rule.go +++ b/internal/processing/admin/rule.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // RulesGet returns all rules stored on this instance. diff --git a/internal/processing/admin/signupapprove.go b/internal/processing/admin/signupapprove.go index 84e04fa8d..d33227bb2 100644 --- a/internal/processing/admin/signupapprove.go +++ b/internal/processing/admin/signupapprove.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (p *Processor) SignupApprove( diff --git a/internal/processing/admin/signupapprove_test.go b/internal/processing/admin/signupapprove_test.go index 58b8fdade..7203c3223 100644 --- a/internal/processing/admin/signupapprove_test.go +++ b/internal/processing/admin/signupapprove_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AdminApproveTestSuite struct { diff --git a/internal/processing/admin/signupreject.go b/internal/processing/admin/signupreject.go index 39eff0b87..5b7872a19 100644 --- a/internal/processing/admin/signupreject.go +++ b/internal/processing/admin/signupreject.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (p *Processor) SignupReject( diff --git a/internal/processing/admin/signupreject_test.go b/internal/processing/admin/signupreject_test.go index cb6a25eb3..2017c6364 100644 --- a/internal/processing/admin/signupreject_test.go +++ b/internal/processing/admin/signupreject_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AdminRejectTestSuite struct { diff --git a/internal/processing/admin/util.go b/internal/processing/admin/util.go index f04b3654b..2ad0069d7 100644 --- a/internal/processing/admin/util.go +++ b/internal/processing/admin/util.go @@ -20,9 +20,9 @@ package admin import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // apiDomainPerm is a cheeky shortcut for returning diff --git a/internal/processing/admin/workertask.go b/internal/processing/admin/workertask.go index 6d7cc7b7a..9fcd1f5a1 100644 --- a/internal/processing/admin/workertask.go +++ b/internal/processing/admin/workertask.go @@ -23,12 +23,12 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" ) // NOTE: diff --git a/internal/processing/admin/workertask_test.go b/internal/processing/admin/workertask_test.go index bf326bafd..37b7059d7 100644 --- a/internal/processing/admin/workertask_test.go +++ b/internal/processing/admin/workertask_test.go @@ -27,14 +27,14 @@ import ( "net/url" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" - "github.com/superseriousbusiness/gotosocial/testrig" ) var ( diff --git a/internal/processing/advancedmigrations/advancedmigrations.go b/internal/processing/advancedmigrations/advancedmigrations.go index 3f1876539..d4404bb85 100644 --- a/internal/processing/advancedmigrations/advancedmigrations.go +++ b/internal/processing/advancedmigrations/advancedmigrations.go @@ -21,7 +21,7 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/processing/conversations" + "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" ) // Processor holds references to any other processor that has migrations to run. diff --git a/internal/processing/application/application.go b/internal/processing/application/application.go index 4ad35749e..acecd7f85 100644 --- a/internal/processing/application/application.go +++ b/internal/processing/application/application.go @@ -18,8 +18,8 @@ package application import ( - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/application/create.go b/internal/processing/application/create.go index d1340a39f..7ee6fb6b9 100644 --- a/internal/processing/application/create.go +++ b/internal/processing/application/create.go @@ -24,12 +24,12 @@ import ( "net/url" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/oauth" "github.com/google/uuid" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/oauth" ) func (p *Processor) Create( diff --git a/internal/processing/application/delete.go b/internal/processing/application/delete.go index 02f5e4bfa..7d1a3b495 100644 --- a/internal/processing/application/delete.go +++ b/internal/processing/application/delete.go @@ -21,9 +21,9 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) func (p *Processor) Delete( diff --git a/internal/processing/application/get.go b/internal/processing/application/get.go index 0a3eb8e04..25cc634a6 100644 --- a/internal/processing/application/get.go +++ b/internal/processing/application/get.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) func (p *Processor) Get( diff --git a/internal/processing/common/account.go b/internal/processing/common/account.go index ae26e4ebd..07644e839 100644 --- a/internal/processing/common/account.go +++ b/internal/processing/common/account.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // GetTargetAccountBy fetches the target account with db load function, given the authorized (or, nil) requester's diff --git a/internal/processing/common/common.go b/internal/processing/common/common.go index 29def3506..9f4753147 100644 --- a/internal/processing/common/common.go +++ b/internal/processing/common/common.go @@ -18,11 +18,11 @@ package common import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Processor provides a processor with logic diff --git a/internal/processing/common/media.go b/internal/processing/common/media.go index 7957470cd..e379bfe40 100644 --- a/internal/processing/common/media.go +++ b/internal/processing/common/media.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" ) // StoreLocalMedia is a wrapper around CreateMedia() and diff --git a/internal/processing/common/status.go b/internal/processing/common/status.go index 532b531e5..14245f88a 100644 --- a/internal/processing/common/status.go +++ b/internal/processing/common/status.go @@ -21,14 +21,14 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // GetOwnStatus fetches the given status with ID, diff --git a/internal/processing/conversations/conversations.go b/internal/processing/conversations/conversations.go index d95740605..a4b8b7234 100644 --- a/internal/processing/conversations/conversations.go +++ b/internal/processing/conversations/conversations.go @@ -21,14 +21,14 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/conversations/conversations_test.go b/internal/processing/conversations/conversations_test.go index 06eef0e97..0f96ecbac 100644 --- a/internal/processing/conversations/conversations_test.go +++ b/internal/processing/conversations/conversations_test.go @@ -22,23 +22,23 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + dbtest "code.superseriousbusiness.org/gotosocial/internal/db/test" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - dbtest "github.com/superseriousbusiness/gotosocial/internal/db/test" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/processing/conversations" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ConversationsTestSuite struct { diff --git a/internal/processing/conversations/delete.go b/internal/processing/conversations/delete.go index 5cbdd00a5..0f8281716 100644 --- a/internal/processing/conversations/delete.go +++ b/internal/processing/conversations/delete.go @@ -20,9 +20,9 @@ package conversations import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (p *Processor) Delete( diff --git a/internal/processing/conversations/get.go b/internal/processing/conversations/get.go index 0c7832cae..9218942bf 100644 --- a/internal/processing/conversations/get.go +++ b/internal/processing/conversations/get.go @@ -21,13 +21,13 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // GetAll returns conversations owned by the given account. diff --git a/internal/processing/conversations/get_test.go b/internal/processing/conversations/get_test.go index 7b3d60749..ea8794601 100644 --- a/internal/processing/conversations/get_test.go +++ b/internal/processing/conversations/get_test.go @@ -21,7 +21,7 @@ import ( "context" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" ) func (suite *ConversationsTestSuite) TestGetAll() { diff --git a/internal/processing/conversations/migrate.go b/internal/processing/conversations/migrate.go index 959ffcca4..902024944 100644 --- a/internal/processing/conversations/migrate.go +++ b/internal/processing/conversations/migrate.go @@ -22,12 +22,12 @@ import ( "encoding/json" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) const advancedMigrationID = "20240611190733_add_conversations" diff --git a/internal/processing/conversations/migrate_test.go b/internal/processing/conversations/migrate_test.go index b625e59ba..7253b30a6 100644 --- a/internal/processing/conversations/migrate_test.go +++ b/internal/processing/conversations/migrate_test.go @@ -20,9 +20,9 @@ package conversations_test import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/db/bundb" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db/bundb" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Test that we can migrate DMs to conversations. diff --git a/internal/processing/conversations/read.go b/internal/processing/conversations/read.go index 512a004a3..42f369582 100644 --- a/internal/processing/conversations/read.go +++ b/internal/processing/conversations/read.go @@ -20,10 +20,10 @@ package conversations import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (p *Processor) Read( diff --git a/internal/processing/conversations/read_test.go b/internal/processing/conversations/read_test.go index ebd8f7fe5..3b86326fd 100644 --- a/internal/processing/conversations/read_test.go +++ b/internal/processing/conversations/read_test.go @@ -20,7 +20,7 @@ package conversations_test import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (suite *ConversationsTestSuite) TestRead() { diff --git a/internal/processing/conversations/update.go b/internal/processing/conversations/update.go index 7445994ae..1651d5367 100644 --- a/internal/processing/conversations/update.go +++ b/internal/processing/conversations/update.go @@ -21,14 +21,14 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // ConversationNotification carries the arguments to processing/stream.Processor.Conversation. diff --git a/internal/processing/fedi/accept.go b/internal/processing/fedi/accept.go index fc699ee08..e63b460db 100644 --- a/internal/processing/fedi/accept.go +++ b/internal/processing/fedi/accept.go @@ -21,9 +21,9 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // AcceptGet handles the getting of a fedi/activitypub diff --git a/internal/processing/fedi/collections.go b/internal/processing/fedi/collections.go index c802fb295..5f2615b64 100644 --- a/internal/processing/fedi/collections.go +++ b/internal/processing/fedi/collections.go @@ -24,13 +24,13 @@ import ( "net/url" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // InboxPost handles POST requests to a user's inbox for new activitypub messages. diff --git a/internal/processing/fedi/common.go b/internal/processing/fedi/common.go index 1a4d38bc1..9059aef39 100644 --- a/internal/processing/fedi/common.go +++ b/internal/processing/fedi/common.go @@ -22,9 +22,9 @@ import ( "errors" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) type commonAuth struct { diff --git a/internal/processing/fedi/emoji.go b/internal/processing/fedi/emoji.go index 9ac0ea244..8db8b48ea 100644 --- a/internal/processing/fedi/emoji.go +++ b/internal/processing/fedi/emoji.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // EmojiGet handles the GET for a federated emoji originating from this instance. diff --git a/internal/processing/fedi/fedi.go b/internal/processing/fedi/fedi.go index 52a9d70bf..d770f3927 100644 --- a/internal/processing/fedi/fedi.go +++ b/internal/processing/fedi/fedi.go @@ -18,11 +18,11 @@ package fedi import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/fedi/status.go b/internal/processing/fedi/status.go index 86925c2b1..497bcc177 100644 --- a/internal/processing/fedi/status.go +++ b/internal/processing/fedi/status.go @@ -25,12 +25,12 @@ import ( "strconv" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // StatusGet handles the getting of a fedi/activitypub representation of a local status. diff --git a/internal/processing/fedi/user.go b/internal/processing/fedi/user.go index 79c1b4fdb..bf2f2a90e 100644 --- a/internal/processing/fedi/user.go +++ b/internal/processing/fedi/user.go @@ -23,10 +23,10 @@ import ( "fmt" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // UserGet handles the getting of a fedi/activitypub representation of a user/account, diff --git a/internal/processing/fedi/wellknown.go b/internal/processing/fedi/wellknown.go index 93fd3b28f..0e6989803 100644 --- a/internal/processing/fedi/wellknown.go +++ b/internal/processing/fedi/wellknown.go @@ -21,9 +21,9 @@ import ( "context" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) const ( @@ -34,7 +34,7 @@ const ( nodeInfoSoftwareName = "gotosocial" nodeInfo20Rel = "http://nodeinfo.diaspora.software/ns/schema/2.0" nodeInfo21Rel = "http://nodeinfo.diaspora.software/ns/schema/2.1" - nodeInfoRepo = "https://github.com/superseriousbusiness/gotosocial" + nodeInfoRepo = "https://codeberg.org/superseriousbusiness/gotosocial" nodeInfoHomepage = "https://docs.gotosocial.org" webfingerProfilePage = "http://webfinger.net/rel/profile-page" webFingerProfilePageContentType = "text/html" diff --git a/internal/processing/filters/v1/convert.go b/internal/processing/filters/v1/convert.go index 1e0db5ff1..417cf7b7d 100644 --- a/internal/processing/filters/v1/convert.go +++ b/internal/processing/filters/v1/convert.go @@ -21,9 +21,9 @@ import ( "context" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // apiFilter is a shortcut to return the API v1 filter version of the given diff --git a/internal/processing/filters/v1/create.go b/internal/processing/filters/v1/create.go index 86019d2a6..24517dd7b 100644 --- a/internal/processing/filters/v1/create.go +++ b/internal/processing/filters/v1/create.go @@ -23,12 +23,12 @@ import ( "fmt" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Create a new filter and filter keyword for the given account, using the provided parameters. diff --git a/internal/processing/filters/v1/delete.go b/internal/processing/filters/v1/delete.go index 89282c65d..6a081ff04 100644 --- a/internal/processing/filters/v1/delete.go +++ b/internal/processing/filters/v1/delete.go @@ -21,10 +21,10 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Delete an existing filter keyword and (if empty afterwards) filter for the given account. diff --git a/internal/processing/filters/v1/filters.go b/internal/processing/filters/v1/filters.go index daa9087a9..89b509912 100644 --- a/internal/processing/filters/v1/filters.go +++ b/internal/processing/filters/v1/filters.go @@ -18,9 +18,9 @@ package v1 import ( - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/filters/v1/get.go b/internal/processing/filters/v1/get.go index 3ead09b20..ad35e6272 100644 --- a/internal/processing/filters/v1/get.go +++ b/internal/processing/filters/v1/get.go @@ -23,10 +23,10 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Get looks up a filter keyword by ID and returns it as a v1 filter. diff --git a/internal/processing/filters/v1/update.go b/internal/processing/filters/v1/update.go index 15c5de365..8b50c3fcf 100644 --- a/internal/processing/filters/v1/update.go +++ b/internal/processing/filters/v1/update.go @@ -24,12 +24,12 @@ import ( "strings" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Update an existing filter and filter keyword for the given account, using the provided parameters. diff --git a/internal/processing/filters/v2/convert.go b/internal/processing/filters/v2/convert.go index 1e544e6e4..590edd04b 100644 --- a/internal/processing/filters/v2/convert.go +++ b/internal/processing/filters/v2/convert.go @@ -21,9 +21,9 @@ import ( "context" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // apiFilter is a shortcut to return the API v2 filter version of the given diff --git a/internal/processing/filters/v2/create.go b/internal/processing/filters/v2/create.go index 60dd46f43..c221e1539 100644 --- a/internal/processing/filters/v2/create.go +++ b/internal/processing/filters/v2/create.go @@ -23,13 +23,13 @@ import ( "fmt" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Create a new filter for the given account, using the provided parameters. diff --git a/internal/processing/filters/v2/delete.go b/internal/processing/filters/v2/delete.go index a312180b8..b6a4c6321 100644 --- a/internal/processing/filters/v2/delete.go +++ b/internal/processing/filters/v2/delete.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Delete an existing filter and all its attached keywords and statuses for the given account. diff --git a/internal/processing/filters/v2/filters.go b/internal/processing/filters/v2/filters.go index 85da4df6b..82fef36b6 100644 --- a/internal/processing/filters/v2/filters.go +++ b/internal/processing/filters/v2/filters.go @@ -18,9 +18,9 @@ package v2 import ( - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/filters/v2/get.go b/internal/processing/filters/v2/get.go index 39b937eb2..7240d1ba3 100644 --- a/internal/processing/filters/v2/get.go +++ b/internal/processing/filters/v2/get.go @@ -24,10 +24,10 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Get looks up a filter by ID and returns it with keywords and statuses. diff --git a/internal/processing/filters/v2/keywordcreate.go b/internal/processing/filters/v2/keywordcreate.go index 92d9e5dfd..89ada34f4 100644 --- a/internal/processing/filters/v2/keywordcreate.go +++ b/internal/processing/filters/v2/keywordcreate.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // KeywordCreate adds a filter keyword to an existing filter for the given account, using the provided parameters. diff --git a/internal/processing/filters/v2/keyworddelete.go b/internal/processing/filters/v2/keyworddelete.go index 024991109..390c7b2cf 100644 --- a/internal/processing/filters/v2/keyworddelete.go +++ b/internal/processing/filters/v2/keyworddelete.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // KeywordDelete deletes an existing filter keyword from a filter. diff --git a/internal/processing/filters/v2/keywordget.go b/internal/processing/filters/v2/keywordget.go index 5f5a63b26..e824b2e57 100644 --- a/internal/processing/filters/v2/keywordget.go +++ b/internal/processing/filters/v2/keywordget.go @@ -24,11 +24,11 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // KeywordGet looks up a filter keyword by ID. diff --git a/internal/processing/filters/v2/keywordupdate.go b/internal/processing/filters/v2/keywordupdate.go index 9492e7b3a..4c0a54b83 100644 --- a/internal/processing/filters/v2/keywordupdate.go +++ b/internal/processing/filters/v2/keywordupdate.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // KeywordUpdate updates an existing filter keyword for the given account, using the provided parameters. diff --git a/internal/processing/filters/v2/statuscreate.go b/internal/processing/filters/v2/statuscreate.go index 7d4469eef..927986c69 100644 --- a/internal/processing/filters/v2/statuscreate.go +++ b/internal/processing/filters/v2/statuscreate.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // StatusCreate adds a filter status to an existing filter for the given account, using the provided parameters. diff --git a/internal/processing/filters/v2/statusdelete.go b/internal/processing/filters/v2/statusdelete.go index 706ca691d..e25f7279e 100644 --- a/internal/processing/filters/v2/statusdelete.go +++ b/internal/processing/filters/v2/statusdelete.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // StatusDelete deletes an existing filter status from a filter. diff --git a/internal/processing/filters/v2/statusget.go b/internal/processing/filters/v2/statusget.go index 197a3872e..06a56d271 100644 --- a/internal/processing/filters/v2/statusget.go +++ b/internal/processing/filters/v2/statusget.go @@ -24,11 +24,11 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // StatusGet looks up a filter status by ID. diff --git a/internal/processing/filters/v2/update.go b/internal/processing/filters/v2/update.go index d5b5cce01..9d38cac66 100644 --- a/internal/processing/filters/v2/update.go +++ b/internal/processing/filters/v2/update.go @@ -21,14 +21,15 @@ import ( "context" "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" "time" + + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Update an existing filter for the given account, using the provided parameters. diff --git a/internal/processing/followrequest_test.go b/internal/processing/followrequest_test.go index db0419522..ca77d1e34 100644 --- a/internal/processing/followrequest_test.go +++ b/internal/processing/followrequest_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) // TODO: move this to the "internal/processing/account" pkg diff --git a/internal/processing/instance.go b/internal/processing/instance.go index e723c751e..87fe1e3ef 100644 --- a/internal/processing/instance.go +++ b/internal/processing/instance.go @@ -22,16 +22,16 @@ import ( "fmt" "sort" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" ) func (p *Processor) InstanceGetV1(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode) { diff --git a/internal/processing/interactionrequests/accept.go b/internal/processing/interactionrequests/accept.go index ad86e50d1..ce682380b 100644 --- a/internal/processing/interactionrequests/accept.go +++ b/internal/processing/interactionrequests/accept.go @@ -21,13 +21,13 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Accept accepts an interaction request with the given ID, diff --git a/internal/processing/interactionrequests/accept_test.go b/internal/processing/interactionrequests/accept_test.go index 75fb1e512..eae17b6d6 100644 --- a/internal/processing/interactionrequests/accept_test.go +++ b/internal/processing/interactionrequests/accept_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/interactionrequests" - "github.com/superseriousbusiness/gotosocial/testrig" ) type AcceptTestSuite struct { diff --git a/internal/processing/interactionrequests/get.go b/internal/processing/interactionrequests/get.go index 8f8a7f35d..397730855 100644 --- a/internal/processing/interactionrequests/get.go +++ b/internal/processing/interactionrequests/get.go @@ -23,13 +23,13 @@ import ( "net/url" "strconv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // GetPage returns a page of interaction requests targeting diff --git a/internal/processing/interactionrequests/interactionrequests.go b/internal/processing/interactionrequests/interactionrequests.go index d56636233..435bbd42f 100644 --- a/internal/processing/interactionrequests/interactionrequests.go +++ b/internal/processing/interactionrequests/interactionrequests.go @@ -18,9 +18,9 @@ package interactionrequests import ( - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Processor wraps functionality for getting, diff --git a/internal/processing/interactionrequests/interactionrequests_test.go b/internal/processing/interactionrequests/interactionrequests_test.go index ce2aa351a..6459036fc 100644 --- a/internal/processing/interactionrequests/interactionrequests_test.go +++ b/internal/processing/interactionrequests/interactionrequests_test.go @@ -18,9 +18,9 @@ package interactionrequests_test import ( + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) const ( diff --git a/internal/processing/interactionrequests/reject.go b/internal/processing/interactionrequests/reject.go index dcf07a03f..3ceaa47d9 100644 --- a/internal/processing/interactionrequests/reject.go +++ b/internal/processing/interactionrequests/reject.go @@ -21,12 +21,12 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // Reject rejects an interaction request with the given ID, diff --git a/internal/processing/interactionrequests/reject_test.go b/internal/processing/interactionrequests/reject_test.go index 6e4aac691..353684938 100644 --- a/internal/processing/interactionrequests/reject_test.go +++ b/internal/processing/interactionrequests/reject_test.go @@ -22,11 +22,11 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/processing/interactionrequests" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RejectTestSuite struct { diff --git a/internal/processing/list/create.go b/internal/processing/list/create.go index dacd7909f..43bec321a 100644 --- a/internal/processing/list/create.go +++ b/internal/processing/list/create.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // Create creates one a new list for the given account, using the provided parameters. diff --git a/internal/processing/list/delete.go b/internal/processing/list/delete.go index 327ac9d16..8039487dd 100644 --- a/internal/processing/list/delete.go +++ b/internal/processing/list/delete.go @@ -20,9 +20,9 @@ package list import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Delete deletes one list for the given account. diff --git a/internal/processing/list/get.go b/internal/processing/list/get.go index b98678eef..aefa01027 100644 --- a/internal/processing/list/get.go +++ b/internal/processing/list/get.go @@ -21,13 +21,13 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Get returns the api model of one list with the given ID. diff --git a/internal/processing/list/list.go b/internal/processing/list/list.go index 0003816fb..453bf3a57 100644 --- a/internal/processing/list/list.go +++ b/internal/processing/list/list.go @@ -18,8 +18,8 @@ package list import ( - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/list/update.go b/internal/processing/list/update.go index 408c334de..c64686344 100644 --- a/internal/processing/list/update.go +++ b/internal/processing/list/update.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Update updates one list for the given account, using the provided parameters. diff --git a/internal/processing/list/updateentries.go b/internal/processing/list/updateentries.go index c15248f39..7cf6a3cd3 100644 --- a/internal/processing/list/updateentries.go +++ b/internal/processing/list/updateentries.go @@ -22,12 +22,12 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // AddToList adds targetAccountIDs to the given list, if valid. diff --git a/internal/processing/list/util.go b/internal/processing/list/util.go index 74d148704..faed5479b 100644 --- a/internal/processing/list/util.go +++ b/internal/processing/list/util.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // getList is a shortcut to get one list from the database and diff --git a/internal/processing/markers/get.go b/internal/processing/markers/get.go index 38e8b53dc..19c8feedc 100644 --- a/internal/processing/markers/get.go +++ b/internal/processing/markers/get.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Get returns an API model for the markers of the requested timelines. diff --git a/internal/processing/markers/markers.go b/internal/processing/markers/markers.go index 8817ed1a7..18624d44c 100644 --- a/internal/processing/markers/markers.go +++ b/internal/processing/markers/markers.go @@ -18,8 +18,8 @@ package markers import ( - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/markers/update.go b/internal/processing/markers/update.go index 22fe65faf..21c1bc169 100644 --- a/internal/processing/markers/update.go +++ b/internal/processing/markers/update.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Update updates the given markers and returns an API model for them. diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go index 5ea630618..e925297ff 100644 --- a/internal/processing/media/create.go +++ b/internal/processing/media/create.go @@ -23,13 +23,13 @@ import ( "fmt" "io" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" "codeberg.org/gruf/go-iotools" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" ) // Create creates a new media attachment belonging to the given account, using the request form. diff --git a/internal/processing/media/delete.go b/internal/processing/media/delete.go index 32650fb2c..afb5af1f3 100644 --- a/internal/processing/media/delete.go +++ b/internal/processing/media/delete.go @@ -23,9 +23,9 @@ import ( "fmt" "strings" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/storage" ) // Delete deletes the media attachment with the given ID, including all files pertaining to that attachment. diff --git a/internal/processing/media/getemoji.go b/internal/processing/media/getemoji.go index 06712756a..d80886979 100644 --- a/internal/processing/media/getemoji.go +++ b/internal/processing/media/getemoji.go @@ -21,10 +21,10 @@ import ( "context" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // GetCustomEmojis returns a list of all useable local custom emojis stored on this instance. diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go index 11d8f7eb5..2f46d6e0c 100644 --- a/internal/processing/media/getfile.go +++ b/internal/processing/media/getfile.go @@ -25,14 +25,14 @@ import ( "strings" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/uris" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // GetFile retrieves a file from storage and streams it back diff --git a/internal/processing/media/getfile_test.go b/internal/processing/media/getfile_test.go index 34f5d99a2..cde0864f8 100644 --- a/internal/processing/media/getfile_test.go +++ b/internal/processing/media/getfile_test.go @@ -23,12 +23,12 @@ import ( "path" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type GetFileTestSuite struct { diff --git a/internal/processing/media/getmedia.go b/internal/processing/media/getmedia.go index 8f5b9d740..5144bbd8e 100644 --- a/internal/processing/media/getmedia.go +++ b/internal/processing/media/getmedia.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (p *Processor) Get(ctx context.Context, account *gtsmodel.Account, mediaAttachmentID string) (*apimodel.Attachment, gtserror.WithCode) { diff --git a/internal/processing/media/media.go b/internal/processing/media/media.go index 76ed68f5a..4967e4d11 100644 --- a/internal/processing/media/media.go +++ b/internal/processing/media/media.go @@ -18,12 +18,12 @@ package media import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/media/media_test.go b/internal/processing/media/media_test.go index 6d44321b7..b074ae768 100644 --- a/internal/processing/media/media_test.go +++ b/internal/processing/media/media_test.go @@ -18,19 +18,19 @@ package media_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + mediaprocessing "code.superseriousbusiness.org/gotosocial/internal/processing/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - mediaprocessing "github.com/superseriousbusiness/gotosocial/internal/processing/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type MediaStandardTestSuite struct { diff --git a/internal/processing/media/profile.go b/internal/processing/media/profile.go index 5c266e372..38c2893e1 100644 --- a/internal/processing/media/profile.go +++ b/internal/processing/media/profile.go @@ -21,9 +21,9 @@ import ( "context" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // DeleteAvatar deletes the account's avatar, if one exists, and returns the updated account. diff --git a/internal/processing/media/unattach.go b/internal/processing/media/unattach.go index ddf2dda20..8eec907fd 100644 --- a/internal/processing/media/unattach.go +++ b/internal/processing/media/unattach.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Unattach unattaches the media attachment with the given ID from any statuses it was attached to, making it available diff --git a/internal/processing/media/update.go b/internal/processing/media/update.go index 5afa5d63c..3acf238b0 100644 --- a/internal/processing/media/update.go +++ b/internal/processing/media/update.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/text" ) // Update updates a media attachment with the given id, using the provided form parameters. diff --git a/internal/processing/oauth.go b/internal/processing/oauth.go index 749716398..573c0d53a 100644 --- a/internal/processing/oauth.go +++ b/internal/processing/oauth.go @@ -21,8 +21,8 @@ import ( "context" "net/http" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "code.superseriousbusiness.org/oauth2/v4" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (p *Processor) OAuthHandleAuthorizeRequest(w http.ResponseWriter, r *http.Request) gtserror.WithCode { diff --git a/internal/processing/parsemention.go b/internal/processing/parsemention.go index 035f057b8..6566ecd1c 100644 --- a/internal/processing/parsemention.go +++ b/internal/processing/parsemention.go @@ -21,13 +21,13 @@ import ( "context" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // GetParseMentionFunc returns a new ParseMentionFunc using the provided state and federator. diff --git a/internal/processing/parsemention_test.go b/internal/processing/parsemention_test.go index f97133969..2c2cc3085 100644 --- a/internal/processing/parsemention_test.go +++ b/internal/processing/parsemention_test.go @@ -22,10 +22,10 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/processing" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/processing" ) type ParseMentionTestSuite struct { diff --git a/internal/processing/polls/expiry.go b/internal/processing/polls/expiry.go index d02a05f0d..5ce893111 100644 --- a/internal/processing/polls/expiry.go +++ b/internal/processing/polls/expiry.go @@ -21,12 +21,12 @@ import ( "context" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (p *Processor) ScheduleAll(ctx context.Context) error { diff --git a/internal/processing/polls/get.go b/internal/processing/polls/get.go index 42fecbd43..fa4e235f7 100644 --- a/internal/processing/polls/get.go +++ b/internal/processing/polls/get.go @@ -20,9 +20,9 @@ package polls import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (p *Processor) PollGet(ctx context.Context, requester *gtsmodel.Account, pollID string) (*apimodel.Poll, gtserror.WithCode) { diff --git a/internal/processing/polls/poll.go b/internal/processing/polls/poll.go index fe8fc71c5..c51bb0e96 100644 --- a/internal/processing/polls/poll.go +++ b/internal/processing/polls/poll.go @@ -20,12 +20,12 @@ package polls import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/polls/poll_test.go b/internal/processing/polls/poll_test.go index bf6ae4aad..421f05361 100644 --- a/internal/processing/polls/poll_test.go +++ b/internal/processing/polls/poll_test.go @@ -23,17 +23,17 @@ import ( "net/http" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/processing/polls" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/processing/polls" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type PollTestSuite struct { diff --git a/internal/processing/polls/vote.go b/internal/processing/polls/vote.go index 6585793cd..14777d9df 100644 --- a/internal/processing/polls/vote.go +++ b/internal/processing/polls/vote.go @@ -21,13 +21,13 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) func (p *Processor) PollVote(ctx context.Context, requester *gtsmodel.Account, pollID string, choices []int) (*apimodel.Poll, gtserror.WithCode) { diff --git a/internal/processing/preferences.go b/internal/processing/preferences.go index fb445ec5b..ebcb0e6b6 100644 --- a/internal/processing/preferences.go +++ b/internal/processing/preferences.go @@ -20,9 +20,9 @@ package processing import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func (p *Processor) PreferencesGet(ctx context.Context, accountID string) (*apimodel.Preferences, gtserror.WithCode) { diff --git a/internal/processing/preferences_test.go b/internal/processing/preferences_test.go index be88b5edf..dc6a8d878 100644 --- a/internal/processing/preferences_test.go +++ b/internal/processing/preferences_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type PreferencesTestSuite struct { diff --git a/internal/processing/processor.go b/internal/processing/processor.go index 0324f49cf..63e996b38 100644 --- a/internal/processing/processor.go +++ b/internal/processing/processor.go @@ -18,42 +18,42 @@ package processing import ( - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - mm "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/admin" - "github.com/superseriousbusiness/gotosocial/internal/processing/advancedmigrations" - "github.com/superseriousbusiness/gotosocial/internal/processing/application" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/processing/conversations" - "github.com/superseriousbusiness/gotosocial/internal/processing/fedi" - filtersv1 "github.com/superseriousbusiness/gotosocial/internal/processing/filters/v1" - filtersv2 "github.com/superseriousbusiness/gotosocial/internal/processing/filters/v2" - "github.com/superseriousbusiness/gotosocial/internal/processing/interactionrequests" - "github.com/superseriousbusiness/gotosocial/internal/processing/list" - "github.com/superseriousbusiness/gotosocial/internal/processing/markers" - "github.com/superseriousbusiness/gotosocial/internal/processing/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/polls" - "github.com/superseriousbusiness/gotosocial/internal/processing/push" - "github.com/superseriousbusiness/gotosocial/internal/processing/report" - "github.com/superseriousbusiness/gotosocial/internal/processing/search" - "github.com/superseriousbusiness/gotosocial/internal/processing/status" - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/processing/tags" - "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" - "github.com/superseriousbusiness/gotosocial/internal/processing/user" - "github.com/superseriousbusiness/gotosocial/internal/processing/workers" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + mm "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/admin" + "code.superseriousbusiness.org/gotosocial/internal/processing/advancedmigrations" + "code.superseriousbusiness.org/gotosocial/internal/processing/application" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" + "code.superseriousbusiness.org/gotosocial/internal/processing/fedi" + filtersv1 "code.superseriousbusiness.org/gotosocial/internal/processing/filters/v1" + filtersv2 "code.superseriousbusiness.org/gotosocial/internal/processing/filters/v2" + "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" + "code.superseriousbusiness.org/gotosocial/internal/processing/list" + "code.superseriousbusiness.org/gotosocial/internal/processing/markers" + "code.superseriousbusiness.org/gotosocial/internal/processing/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/polls" + "code.superseriousbusiness.org/gotosocial/internal/processing/push" + "code.superseriousbusiness.org/gotosocial/internal/processing/report" + "code.superseriousbusiness.org/gotosocial/internal/processing/search" + "code.superseriousbusiness.org/gotosocial/internal/processing/status" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/processing/tags" + "code.superseriousbusiness.org/gotosocial/internal/processing/timeline" + "code.superseriousbusiness.org/gotosocial/internal/processing/user" + "code.superseriousbusiness.org/gotosocial/internal/processing/workers" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/webpush" ) // Processor groups together processing functions and diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go index a743f75ee..6f5e79afd 100644 --- a/internal/processing/processor_test.go +++ b/internal/processing/processor_test.go @@ -20,26 +20,26 @@ package processing_test import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/admin" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ProcessingStandardTestSuite struct { diff --git a/internal/processing/push/create.go b/internal/processing/push/create.go index dc15ccf12..3beeab6cc 100644 --- a/internal/processing/push/create.go +++ b/internal/processing/push/create.go @@ -20,11 +20,11 @@ package push import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // CreateOrReplace creates a Web Push subscription for the given access token, diff --git a/internal/processing/push/delete.go b/internal/processing/push/delete.go index 6f5c61444..e5369f56a 100644 --- a/internal/processing/push/delete.go +++ b/internal/processing/push/delete.go @@ -20,7 +20,7 @@ package push import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // Delete deletes the Web Push subscription for the given access token, if there is one. diff --git a/internal/processing/push/get.go b/internal/processing/push/get.go index 542f08862..df0e80dc3 100644 --- a/internal/processing/push/get.go +++ b/internal/processing/push/get.go @@ -21,9 +21,9 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // Get returns the Web Push subscription for the given access token. diff --git a/internal/processing/push/push.go b/internal/processing/push/push.go index f46280386..24a2254ac 100644 --- a/internal/processing/push/push.go +++ b/internal/processing/push/push.go @@ -20,11 +20,11 @@ package push import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/push/update.go b/internal/processing/push/update.go index 94529455a..bbd9e3943 100644 --- a/internal/processing/push/update.go +++ b/internal/processing/push/update.go @@ -21,10 +21,10 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Update updates the Web Push subscription for the given access token. diff --git a/internal/processing/report/create.go b/internal/processing/report/create.go index dd31a8798..734670e17 100644 --- a/internal/processing/report/create.go +++ b/internal/processing/report/create.go @@ -22,14 +22,14 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // Create creates one user report / flag, using the provided form parameters. diff --git a/internal/processing/report/get.go b/internal/processing/report/get.go index 2e3c1b2dc..136f09470 100644 --- a/internal/processing/report/get.go +++ b/internal/processing/report/get.go @@ -24,12 +24,12 @@ import ( "net/url" "strconv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // Get returns the user view of a moderation report, with the given id. diff --git a/internal/processing/report/report.go b/internal/processing/report/report.go index c871172bb..cdc2dc3e0 100644 --- a/internal/processing/report/report.go +++ b/internal/processing/report/report.go @@ -18,8 +18,8 @@ package report import ( - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/search/accounts.go b/internal/processing/search/accounts.go index 7201d0688..9345aaba6 100644 --- a/internal/processing/search/accounts.go +++ b/internal/processing/search/accounts.go @@ -22,14 +22,14 @@ import ( "errors" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-kv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // Accounts does a partial search for accounts that diff --git a/internal/processing/search/get.go b/internal/processing/search/get.go index 7a65bed1d..2051fb399 100644 --- a/internal/processing/search/get.go +++ b/internal/processing/search/get.go @@ -25,16 +25,16 @@ import ( "net/url" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-kv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/util" ) const ( diff --git a/internal/processing/search/lookup.go b/internal/processing/search/lookup.go index f5c131841..3250f9848 100644 --- a/internal/processing/search/lookup.go +++ b/internal/processing/search/lookup.go @@ -23,12 +23,12 @@ import ( "fmt" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-kv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // Lookup does a quick, non-resolving search for accounts that diff --git a/internal/processing/search/search.go b/internal/processing/search/search.go index 18008647c..0543b4db4 100644 --- a/internal/processing/search/search.go +++ b/internal/processing/search/search.go @@ -18,10 +18,10 @@ package search import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/search/util.go b/internal/processing/search/util.go index e2947ea16..5d8e34960 100644 --- a/internal/processing/search/util.go +++ b/internal/processing/search/util.go @@ -20,11 +20,11 @@ package search import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) // return true if given queryType should include accounts. diff --git a/internal/processing/status/bookmark.go b/internal/processing/status/bookmark.go index ae61696a8..7996a9518 100644 --- a/internal/processing/status/bookmark.go +++ b/internal/processing/status/bookmark.go @@ -21,12 +21,12 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // BookmarkCreate adds a bookmark for the requestingAccount, targeting the given status (no-op if bookmark already exists). diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go index 0e09a8e7b..c8c50d3ee 100644 --- a/internal/processing/status/boost.go +++ b/internal/processing/status/boost.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // BoostCreate processes the boost/reblog of target diff --git a/internal/processing/status/common.go b/internal/processing/status/common.go index 77058ed10..c764a64b4 100644 --- a/internal/processing/status/common.go +++ b/internal/processing/status/common.go @@ -23,16 +23,16 @@ import ( "fmt" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" - "github.com/superseriousbusiness/gotosocial/internal/validate" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/validate" ) // validateStatusContent will validate the common diff --git a/internal/processing/status/context.go b/internal/processing/status/context.go index 47806a64b..c18a4f7bd 100644 --- a/internal/processing/status/context.go +++ b/internal/processing/status/context.go @@ -23,11 +23,11 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // internalThreadContext is like diff --git a/internal/processing/status/context_test.go b/internal/processing/status/context_test.go index aba58e776..5d7e40b71 100644 --- a/internal/processing/status/context_test.go +++ b/internal/processing/status/context_test.go @@ -20,9 +20,9 @@ package status_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/status" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/status" ) type topoSortTestSuite struct { diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index 775ba78e2..8596f2f1a 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -22,19 +22,19 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Create processes the given form to create a new status, returning the api model representation of that status if it's OK. diff --git a/internal/processing/status/create_test.go b/internal/processing/status/create_test.go index 1199642b6..13e066387 100644 --- a/internal/processing/status/create_test.go +++ b/internal/processing/status/create_test.go @@ -21,12 +21,12 @@ import ( "context" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type StatusCreateTestSuite struct { diff --git a/internal/processing/status/delete.go b/internal/processing/status/delete.go index 8fec8fc5e..4a3c32f4a 100644 --- a/internal/processing/status/delete.go +++ b/internal/processing/status/delete.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // Delete processes the delete of a given status, returning the deleted status if the delete goes through. diff --git a/internal/processing/status/edit.go b/internal/processing/status/edit.go index a9323a72c..464ddde43 100644 --- a/internal/processing/status/edit.go +++ b/internal/processing/status/edit.go @@ -24,16 +24,16 @@ import ( "slices" "time" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) // Edit ... diff --git a/internal/processing/status/edit_test.go b/internal/processing/status/edit_test.go index e6673c3cc..6078a7d3e 100644 --- a/internal/processing/status/edit_test.go +++ b/internal/processing/status/edit_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" ) type StatusEditTestSuite struct { diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go index defc59af0..95eb8bff2 100644 --- a/internal/processing/status/fave.go +++ b/internal/processing/status/fave.go @@ -22,16 +22,16 @@ import ( "errors" "fmt" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (p *Processor) getFaveableStatus( diff --git a/internal/processing/status/get.go b/internal/processing/status/get.go index e97d9e1b2..edcaa07fa 100644 --- a/internal/processing/status/get.go +++ b/internal/processing/status/get.go @@ -21,10 +21,10 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Get gets the given status, taking account of privacy settings and blocks etc. diff --git a/internal/processing/status/mute.go b/internal/processing/status/mute.go index 8888b59d4..638b7cfb2 100644 --- a/internal/processing/status/mute.go +++ b/internal/processing/status/mute.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // getMuteableStatus fetches targetStatusID status and diff --git a/internal/processing/status/pin.go b/internal/processing/status/pin.go index 3f8435e52..dad11d6b2 100644 --- a/internal/processing/status/pin.go +++ b/internal/processing/status/pin.go @@ -23,9 +23,9 @@ import ( "fmt" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) const allowedPinnedCount = 10 diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go index 26dfd0d7a..b911c03d7 100644 --- a/internal/processing/status/status.go +++ b/internal/processing/status/status.go @@ -18,16 +18,16 @@ package status import ( - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/processing/interactionrequests" - "github.com/superseriousbusiness/gotosocial/internal/processing/polls" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" + "code.superseriousbusiness.org/gotosocial/internal/processing/polls" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go index 19f3f5ebc..75775cf8a 100644 --- a/internal/processing/status/status_test.go +++ b/internal/processing/status/status_test.go @@ -18,24 +18,24 @@ package status_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" + "code.superseriousbusiness.org/gotosocial/internal/processing/polls" + "code.superseriousbusiness.org/gotosocial/internal/processing/status" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/processing/interactionrequests" - "github.com/superseriousbusiness/gotosocial/internal/processing/polls" - "github.com/superseriousbusiness/gotosocial/internal/processing/status" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StatusStandardTestSuite struct { diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go index 99cff7c56..fcaf37d82 100644 --- a/internal/processing/status/util.go +++ b/internal/processing/status/util.go @@ -21,10 +21,10 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (p *Processor) implicitlyAccept( diff --git a/internal/processing/stream/authorize.go b/internal/processing/stream/authorize.go index cedd21e0b..44463d5c6 100644 --- a/internal/processing/stream/authorize.go +++ b/internal/processing/stream/authorize.go @@ -24,10 +24,10 @@ import ( "slices" "strings" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Authorize returns an oauth2 token info in response to an access token query from the streaming API diff --git a/internal/processing/stream/authorize_test.go b/internal/processing/stream/authorize_test.go index cb91d5b30..ee0e528af 100644 --- a/internal/processing/stream/authorize_test.go +++ b/internal/processing/stream/authorize_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/db" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" ) type AuthorizeTestSuite struct { diff --git a/internal/processing/stream/conversation.go b/internal/processing/stream/conversation.go index a0236c459..b5394ee17 100644 --- a/internal/processing/stream/conversation.go +++ b/internal/processing/stream/conversation.go @@ -21,10 +21,10 @@ import ( "context" "encoding/json" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" "codeberg.org/gruf/go-byteutil" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" ) // Conversation streams the given conversation to any open, appropriate streams belonging to the given account. diff --git a/internal/processing/stream/delete.go b/internal/processing/stream/delete.go index 1c61b98d3..fc763f910 100644 --- a/internal/processing/stream/delete.go +++ b/internal/processing/stream/delete.go @@ -20,7 +20,7 @@ package stream import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/stream" ) // Delete streams the delete of the given statusID to *ALL* open streams. diff --git a/internal/processing/stream/filterschanged.go b/internal/processing/stream/filterschanged.go index b98506b9f..dff22c64b 100644 --- a/internal/processing/stream/filterschanged.go +++ b/internal/processing/stream/filterschanged.go @@ -20,8 +20,8 @@ package stream import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/stream" ) // FiltersChanged streams a filters changed event to any open, appropriate streams belonging to the given account. diff --git a/internal/processing/stream/notification.go b/internal/processing/stream/notification.go index a16da11e6..ef3acdc79 100644 --- a/internal/processing/stream/notification.go +++ b/internal/processing/stream/notification.go @@ -21,11 +21,11 @@ import ( "context" "encoding/json" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" "codeberg.org/gruf/go-byteutil" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" ) // Notify streams the given notification to any open, appropriate streams belonging to the given account. diff --git a/internal/processing/stream/notification_test.go b/internal/processing/stream/notification_test.go index 2ede28079..e0874e713 100644 --- a/internal/processing/stream/notification_test.go +++ b/internal/processing/stream/notification_test.go @@ -23,9 +23,9 @@ import ( "encoding/json" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) type NotificationTestSuite struct { diff --git a/internal/processing/stream/open.go b/internal/processing/stream/open.go index 2f2bbd4a3..bafa277a5 100644 --- a/internal/processing/stream/open.go +++ b/internal/processing/stream/open.go @@ -20,11 +20,11 @@ package stream import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" ) // Open returns a new Stream for the given account, which will contain a channel for passing messages back to the caller. diff --git a/internal/processing/stream/statusupdate.go b/internal/processing/stream/statusupdate.go index bd4658873..2f1ca598b 100644 --- a/internal/processing/stream/statusupdate.go +++ b/internal/processing/stream/statusupdate.go @@ -21,11 +21,11 @@ import ( "context" "encoding/json" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" "codeberg.org/gruf/go-byteutil" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" ) // StatusUpdate streams the given edited status to any open, appropriate streams belonging to the given account. diff --git a/internal/processing/stream/statusupdate_test.go b/internal/processing/stream/statusupdate_test.go index 1f0bcd142..0045cceed 100644 --- a/internal/processing/stream/statusupdate_test.go +++ b/internal/processing/stream/statusupdate_test.go @@ -23,10 +23,10 @@ import ( "encoding/json" "testing" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "github.com/stretchr/testify/suite" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) type StatusUpdateTestSuite struct { diff --git a/internal/processing/stream/stream.go b/internal/processing/stream/stream.go index 0b7285b58..19a82a8a2 100644 --- a/internal/processing/stream/stream.go +++ b/internal/processing/stream/stream.go @@ -18,9 +18,9 @@ package stream import ( - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/stream" ) type Processor struct { diff --git a/internal/processing/stream/stream_test.go b/internal/processing/stream/stream_test.go index 3e5bad2b1..47c85af1f 100644 --- a/internal/processing/stream/stream_test.go +++ b/internal/processing/stream/stream_test.go @@ -18,14 +18,14 @@ package stream_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type StreamTestSuite struct { diff --git a/internal/processing/stream/update.go b/internal/processing/stream/update.go index a84763d51..f2b064c28 100644 --- a/internal/processing/stream/update.go +++ b/internal/processing/stream/update.go @@ -21,11 +21,11 @@ import ( "context" "encoding/json" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" "codeberg.org/gruf/go-byteutil" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" ) // Update streams the given update to any open, appropriate streams belonging to the given account. diff --git a/internal/processing/tags/follow.go b/internal/processing/tags/follow.go index f840f4bb7..b0ee0a995 100644 --- a/internal/processing/tags/follow.go +++ b/internal/processing/tags/follow.go @@ -21,11 +21,11 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" ) // Follow follows the tag with the given name as the given account. diff --git a/internal/processing/tags/followed.go b/internal/processing/tags/followed.go index b9c450653..eaecc0983 100644 --- a/internal/processing/tags/followed.go +++ b/internal/processing/tags/followed.go @@ -21,12 +21,12 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // Followed gets the user's list of followed tags. diff --git a/internal/processing/tags/followedtags.go b/internal/processing/tags/followedtags.go index c9093a6c6..1619e433a 100644 --- a/internal/processing/tags/followedtags.go +++ b/internal/processing/tags/followedtags.go @@ -20,11 +20,11 @@ package tags import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/tags/get.go b/internal/processing/tags/get.go index c8fa66137..c7e343150 100644 --- a/internal/processing/tags/get.go +++ b/internal/processing/tags/get.go @@ -21,10 +21,10 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Get gets the tag with the given name, including whether it's followed by the given account. diff --git a/internal/processing/tags/unfollow.go b/internal/processing/tags/unfollow.go index fb844cd9f..8f303466c 100644 --- a/internal/processing/tags/unfollow.go +++ b/internal/processing/tags/unfollow.go @@ -21,10 +21,10 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Unfollow unfollows the tag with the given name as the given account. diff --git a/internal/processing/timeline/faved.go b/internal/processing/timeline/faved.go index bdafcac36..4cb3c30a5 100644 --- a/internal/processing/timeline/faved.go +++ b/internal/processing/timeline/faved.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // FavedTimelineGet ... diff --git a/internal/processing/timeline/home.go b/internal/processing/timeline/home.go index 61fef005b..bcb63fcff 100644 --- a/internal/processing/timeline/home.go +++ b/internal/processing/timeline/home.go @@ -21,12 +21,12 @@ import ( "context" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // HomeTimelineGet gets a pageable timeline of statuses diff --git a/internal/processing/timeline/home_test.go b/internal/processing/timeline/home_test.go index 50025b9a8..ce255acbd 100644 --- a/internal/processing/timeline/home_test.go +++ b/internal/processing/timeline/home_test.go @@ -21,12 +21,12 @@ import ( "context" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type HomeTestSuite struct { diff --git a/internal/processing/timeline/list.go b/internal/processing/timeline/list.go index 10a7bb388..dbf07cdd4 100644 --- a/internal/processing/timeline/list.go +++ b/internal/processing/timeline/list.go @@ -21,14 +21,14 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // ListTimelineGet gets a pageable timeline of statuses diff --git a/internal/processing/timeline/notification.go b/internal/processing/timeline/notification.go index ba1e3dba8..0da9fb55e 100644 --- a/internal/processing/timeline/notification.go +++ b/internal/processing/timeline/notification.go @@ -23,17 +23,17 @@ import ( "fmt" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // NotificationsGet ... diff --git a/internal/processing/timeline/public.go b/internal/processing/timeline/public.go index 0e675da14..527000166 100644 --- a/internal/processing/timeline/public.go +++ b/internal/processing/timeline/public.go @@ -20,12 +20,12 @@ package timeline import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" ) // PublicTimelineGet gets a pageable timeline of public statuses diff --git a/internal/processing/timeline/public_test.go b/internal/processing/timeline/public_test.go index b5017af71..b8520d9c8 100644 --- a/internal/processing/timeline/public_test.go +++ b/internal/processing/timeline/public_test.go @@ -21,12 +21,12 @@ import ( "context" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type PublicTestSuite struct { diff --git a/internal/processing/timeline/tag.go b/internal/processing/timeline/tag.go index 685bac376..f48f89049 100644 --- a/internal/processing/timeline/tag.go +++ b/internal/processing/timeline/tag.go @@ -22,14 +22,14 @@ import ( "errors" "net/http" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/text" ) // TagTimelineGet gets a pageable timeline for the given diff --git a/internal/processing/timeline/timeline.go b/internal/processing/timeline/timeline.go index 54ea2cccd..2eab57195 100644 --- a/internal/processing/timeline/timeline.go +++ b/internal/processing/timeline/timeline.go @@ -23,19 +23,19 @@ import ( "net/http" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - timelinepkg "github.com/superseriousbusiness/gotosocial/internal/cache/timeline" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/paging" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + timelinepkg "code.superseriousbusiness.org/gotosocial/internal/cache/timeline" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/paging" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) var ( diff --git a/internal/processing/timeline/timeline_test.go b/internal/processing/timeline/timeline_test.go index 8ff6be5d1..5afbb2353 100644 --- a/internal/processing/timeline/timeline_test.go +++ b/internal/processing/timeline/timeline_test.go @@ -18,15 +18,15 @@ package timeline_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/timeline" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TimelineStandardTestSuite struct { diff --git a/internal/processing/user/create.go b/internal/processing/user/create.go index 23fef0004..0b2451b4c 100644 --- a/internal/processing/user/create.go +++ b/internal/processing/user/create.go @@ -22,14 +22,14 @@ import ( "fmt" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/text" "code.superseriousbusiness.org/oauth2/v4" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/text" ) // Create processes the given form for creating a new user+account. diff --git a/internal/processing/user/create_test.go b/internal/processing/user/create_test.go index 9781a4214..d193ab883 100644 --- a/internal/processing/user/create_test.go +++ b/internal/processing/user/create_test.go @@ -22,8 +22,8 @@ import ( "net" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" ) type CreateTestSuite struct { diff --git a/internal/processing/user/delete.go b/internal/processing/user/delete.go index 9783010ef..8ab70b278 100644 --- a/internal/processing/user/delete.go +++ b/internal/processing/user/delete.go @@ -20,10 +20,10 @@ package user import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // DeleteSelf is like Account.Delete, but specifically diff --git a/internal/processing/user/email.go b/internal/processing/user/email.go index 417c7c341..7339b282d 100644 --- a/internal/processing/user/email.go +++ b/internal/processing/user/email.go @@ -23,14 +23,14 @@ import ( "fmt" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/validate" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/validate" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/user/get.go b/internal/processing/user/get.go index 9b19189a8..cbc8c6631 100644 --- a/internal/processing/user/get.go +++ b/internal/processing/user/get.go @@ -20,9 +20,9 @@ package user import ( "context" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // Get returns the API model of the given user. diff --git a/internal/processing/user/password.go b/internal/processing/user/password.go index ead79e209..bcde46b3f 100644 --- a/internal/processing/user/password.go +++ b/internal/processing/user/password.go @@ -20,10 +20,10 @@ package user import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/validate" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/validate" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/user/password_test.go b/internal/processing/user/password_test.go index 7d45341c0..5f65a9e1a 100644 --- a/internal/processing/user/password_test.go +++ b/internal/processing/user/password_test.go @@ -22,9 +22,9 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "codeberg.org/gruf/go-byteutil" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/user/twofactor.go b/internal/processing/user/twofactor.go index 02365f3f1..ec0a3edc8 100644 --- a/internal/processing/user/twofactor.go +++ b/internal/processing/user/twofactor.go @@ -30,14 +30,14 @@ import ( "strings" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-byteutil" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/processing/user/user.go b/internal/processing/user/user.go index 5efb89061..412935fba 100644 --- a/internal/processing/user/user.go +++ b/internal/processing/user/user.go @@ -18,10 +18,10 @@ package user import ( - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Processor struct { diff --git a/internal/processing/user/user_test.go b/internal/processing/user/user_test.go index 46fc73206..9db26a725 100644 --- a/internal/processing/user/user_test.go +++ b/internal/processing/user/user_test.go @@ -18,16 +18,16 @@ package user_test import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing/user" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing/user" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) type UserStandardTestSuite struct { diff --git a/internal/processing/workers/federate.go b/internal/processing/workers/federate.go index 909cb4d22..3cc3d130c 100644 --- a/internal/processing/workers/federate.go +++ b/internal/processing/workers/federate.go @@ -23,13 +23,13 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // federate wraps functions for federating diff --git a/internal/processing/workers/fromclientapi.go b/internal/processing/workers/fromclientapi.go index 661fea866..8cd67dd2a 100644 --- a/internal/processing/workers/fromclientapi.go +++ b/internal/processing/workers/fromclientapi.go @@ -22,21 +22,21 @@ import ( "errors" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // clientAPI wraps processing functions diff --git a/internal/processing/workers/fromclientapi_test.go b/internal/processing/workers/fromclientapi_test.go index 1d70eb96c..552db75da 100644 --- a/internal/processing/workers/fromclientapi_test.go +++ b/internal/processing/workers/fromclientapi_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FromClientAPITestSuite struct { diff --git a/internal/processing/workers/fromfediapi.go b/internal/processing/workers/fromfediapi.go index 3e0f0ba59..0f0c7549e 100644 --- a/internal/processing/workers/fromfediapi.go +++ b/internal/processing/workers/fromfediapi.go @@ -23,22 +23,22 @@ import ( "net/url" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/uris" "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/uris" - - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/util" + + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // fediAPI wraps processing functions diff --git a/internal/processing/workers/fromfediapi_move.go b/internal/processing/workers/fromfediapi_move.go index d2f06de5d..e7c75950a 100644 --- a/internal/processing/workers/fromfediapi_move.go +++ b/internal/processing/workers/fromfediapi_move.go @@ -22,14 +22,14 @@ import ( "errors" "time" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" ) // ShouldProcessMove checks whether we should attempt diff --git a/internal/processing/workers/fromfediapi_test.go b/internal/processing/workers/fromfediapi_test.go index f3e719890..9fe5cb0f4 100644 --- a/internal/processing/workers/fromfediapi_test.go +++ b/internal/processing/workers/fromfediapi_test.go @@ -26,16 +26,16 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type FromFediAPITestSuite struct { diff --git a/internal/processing/workers/surface.go b/internal/processing/workers/surface.go index 4dc58c433..5604ad71d 100644 --- a/internal/processing/workers/surface.go +++ b/internal/processing/workers/surface.go @@ -18,13 +18,13 @@ package workers import ( - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/processing/conversations" - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/webpush" ) // Surface wraps functions for 'surfacing' the result diff --git a/internal/processing/workers/surfaceemail.go b/internal/processing/workers/surfaceemail.go index 56f33eaf3..219f395ad 100644 --- a/internal/processing/workers/surfaceemail.go +++ b/internal/processing/workers/surfaceemail.go @@ -22,13 +22,13 @@ import ( "errors" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/uris" "github.com/google/uuid" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) // emailUserReportClosed emails the user who created the diff --git a/internal/processing/workers/surfacenotify.go b/internal/processing/workers/surfacenotify.go index fdbd5e3c1..6dddae359 100644 --- a/internal/processing/workers/surfacenotify.go +++ b/internal/processing/workers/surfacenotify.go @@ -22,14 +22,14 @@ import ( "errors" "strings" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // notifyPendingReply notifies the account replied-to diff --git a/internal/processing/workers/surfacenotify_test.go b/internal/processing/workers/surfacenotify_test.go index 6444314e2..7acea2436 100644 --- a/internal/processing/workers/surfacenotify_test.go +++ b/internal/processing/workers/surfacenotify_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing/workers" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing/workers" - "github.com/superseriousbusiness/gotosocial/testrig" ) type SurfaceNotifyTestSuite struct { diff --git a/internal/processing/workers/surfacetimeline.go b/internal/processing/workers/surfacetimeline.go index 0f2e80d0f..2046d1995 100644 --- a/internal/processing/workers/surfacetimeline.go +++ b/internal/processing/workers/surfacetimeline.go @@ -21,15 +21,15 @@ import ( "context" "errors" - "github.com/superseriousbusiness/gotosocial/internal/cache/timeline" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/cache/timeline" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // timelineAndNotifyStatus inserts the given status into the HOME diff --git a/internal/processing/workers/util.go b/internal/processing/workers/util.go index d844ab762..b9787456a 100644 --- a/internal/processing/workers/util.go +++ b/internal/processing/workers/util.go @@ -21,17 +21,17 @@ import ( "context" "errors" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/media" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/media" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // util provides util functions used by both diff --git a/internal/processing/workers/workers.go b/internal/processing/workers/workers.go index 9f37f554e..c5b5f6ce2 100644 --- a/internal/processing/workers/workers.go +++ b/internal/processing/workers/workers.go @@ -18,18 +18,18 @@ package workers import ( - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/processing/account" - "github.com/superseriousbusiness/gotosocial/internal/processing/common" - "github.com/superseriousbusiness/gotosocial/internal/processing/conversations" - "github.com/superseriousbusiness/gotosocial/internal/processing/media" - "github.com/superseriousbusiness/gotosocial/internal/processing/stream" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/webpush" - "github.com/superseriousbusiness/gotosocial/internal/workers" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/processing/account" + "code.superseriousbusiness.org/gotosocial/internal/processing/common" + "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" + "code.superseriousbusiness.org/gotosocial/internal/processing/media" + "code.superseriousbusiness.org/gotosocial/internal/processing/stream" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/webpush" + "code.superseriousbusiness.org/gotosocial/internal/workers" ) type Processor struct { diff --git a/internal/processing/workers/workers_test.go b/internal/processing/workers/workers_test.go index d069f0b89..ddd5bd0e4 100644 --- a/internal/processing/workers/workers_test.go +++ b/internal/processing/workers/workers_test.go @@ -20,12 +20,12 @@ package workers_test import ( "context" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/stream" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/stream" - "github.com/superseriousbusiness/gotosocial/testrig" ) const ( diff --git a/internal/router/router.go b/internal/router/router.go index c2bf18b4f..45419807d 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -25,12 +25,12 @@ import ( "net/http" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-debug" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" "golang.org/x/crypto/acme/autocert" ) diff --git a/internal/router/template.go b/internal/router/template.go index 89b7086b2..0bae96548 100644 --- a/internal/router/template.go +++ b/internal/router/template.go @@ -28,15 +28,15 @@ import ( "strings" "unsafe" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/render" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // LoadTemplates loads templates found at `web-template-base-dir` diff --git a/internal/state/state.go b/internal/state/state.go index d6f58e714..6b2a85921 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -18,12 +18,12 @@ package state import ( + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/workers" "codeberg.org/gruf/go-mutexes" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/workers" ) // State provides a means of dependency injection and sharing of resources diff --git a/internal/storage/storage.go b/internal/storage/storage.go index dcef9cde4..3e5a69734 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -28,6 +28,9 @@ import ( "path" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-cache/v3/ttl" "codeberg.org/gruf/go-storage" @@ -35,9 +38,6 @@ import ( "codeberg.org/gruf/go-storage/s3" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) const ( diff --git a/internal/subscriptions/domainperms.go b/internal/subscriptions/domainperms.go index 8da9064f6..1572ffb19 100644 --- a/internal/subscriptions/domainperms.go +++ b/internal/subscriptions/domainperms.go @@ -32,16 +32,16 @@ import ( "codeberg.org/gruf/go-kv" - "github.com/superseriousbusiness/gotosocial/internal/admin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/admin" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // ScheduleJobs schedules domain permission subscription diff --git a/internal/subscriptions/subscriptions.go b/internal/subscriptions/subscriptions.go index 3826cf185..a3794796a 100644 --- a/internal/subscriptions/subscriptions.go +++ b/internal/subscriptions/subscriptions.go @@ -18,9 +18,9 @@ package subscriptions import ( - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) type Subscriptions struct { diff --git a/internal/subscriptions/subscriptions_test.go b/internal/subscriptions/subscriptions_test.go index 4441d8c15..b334207e4 100644 --- a/internal/subscriptions/subscriptions_test.go +++ b/internal/subscriptions/subscriptions_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) const ( diff --git a/internal/text/emojify.go b/internal/text/emojify.go index 961ce8771..42b45b7e1 100644 --- a/internal/text/emojify.go +++ b/internal/text/emojify.go @@ -22,8 +22,8 @@ import ( "html" "html/template" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/regexes" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/regexes" ) // EmojifyWeb replaces emoji shortcodes like `:example:` in the given HTML diff --git a/internal/text/formatter.go b/internal/text/formatter.go index 8f7e6e1f6..5af6738fb 100644 --- a/internal/text/formatter.go +++ b/internal/text/formatter.go @@ -20,8 +20,8 @@ package text import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) // FormatFunc is fulfilled by FromPlain, diff --git a/internal/text/formatter_test.go b/internal/text/formatter_test.go index a078111c1..2951ad0d2 100644 --- a/internal/text/formatter_test.go +++ b/internal/text/formatter_test.go @@ -20,13 +20,13 @@ package text_test import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TextStandardTestSuite struct { diff --git a/internal/text/goldmark_custom_renderer.go b/internal/text/goldmark_custom_renderer.go index 0b31d900b..9fed2c54d 100644 --- a/internal/text/goldmark_custom_renderer.go +++ b/internal/text/goldmark_custom_renderer.go @@ -22,13 +22,13 @@ import ( "errors" "strings" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" "github.com/yuin/goldmark" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" diff --git a/internal/text/goldmark_parsers.go b/internal/text/goldmark_parsers.go index e2c87e057..095f1efb8 100644 --- a/internal/text/goldmark_parsers.go +++ b/internal/text/goldmark_parsers.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/superseriousbusiness/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/regexes" "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" "github.com/yuin/goldmark/text" diff --git a/internal/text/markdown.go b/internal/text/markdown.go index 163996d77..a26182598 100644 --- a/internal/text/markdown.go +++ b/internal/text/markdown.go @@ -23,10 +23,10 @@ import ( "regexp" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/regexes" "codeberg.org/gruf/go-byteutil" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/regexes" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" "github.com/yuin/goldmark/renderer" diff --git a/internal/text/minify.go b/internal/text/minify.go index da61bdcf9..3903b71e5 100644 --- a/internal/text/minify.go +++ b/internal/text/minify.go @@ -18,7 +18,7 @@ package text import ( - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/tdewolff/minify/v2" "github.com/tdewolff/minify/v2/html" ) diff --git a/internal/text/plain.go b/internal/text/plain.go index 17e2800ec..232a1b338 100644 --- a/internal/text/plain.go +++ b/internal/text/plain.go @@ -23,11 +23,11 @@ import ( gohtml "html" "strings" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/regexes" "codeberg.org/gruf/go-byteutil" "github.com/k3a/html2text" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/regexes" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" "github.com/yuin/goldmark/parser" diff --git a/internal/text/plain_test.go b/internal/text/plain_test.go index cb8f4677e..2ac7ae30b 100644 --- a/internal/text/plain_test.go +++ b/internal/text/plain_test.go @@ -20,8 +20,8 @@ package text_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/text" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/text" ) const ( diff --git a/internal/text/sanitize_test.go b/internal/text/sanitize_test.go index 773713353..f2f668326 100644 --- a/internal/text/sanitize_test.go +++ b/internal/text/sanitize_test.go @@ -20,8 +20,8 @@ package text_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/text" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/text" ) const ( diff --git a/internal/text/substring_test.go b/internal/text/substring_test.go index f85688218..4dbdb8cdd 100644 --- a/internal/text/substring_test.go +++ b/internal/text/substring_test.go @@ -20,8 +20,8 @@ package text_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/text" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/text" ) type SubstringTestSuite struct { diff --git a/internal/trans/decoders.go b/internal/trans/decoders.go index 6187e43fa..ae374fd9c 100644 --- a/internal/trans/decoders.go +++ b/internal/trans/decoders.go @@ -24,8 +24,8 @@ import ( "fmt" "time" + transmodel "code.superseriousbusiness.org/gotosocial/internal/trans/model" "github.com/mitchellh/mapstructure" - transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model" ) func newDecoder(target interface{}) (*mapstructure.Decoder, error) { diff --git a/internal/trans/encoders.go b/internal/trans/encoders.go index 3d5688aad..44a655002 100644 --- a/internal/trans/encoders.go +++ b/internal/trans/encoders.go @@ -26,7 +26,7 @@ import ( "fmt" "os" - transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model" + transmodel "code.superseriousbusiness.org/gotosocial/internal/trans/model" ) // accountEncode handles special fields like private + public keys on accounts diff --git a/internal/trans/export.go b/internal/trans/export.go index f242c9b94..1e399116a 100644 --- a/internal/trans/export.go +++ b/internal/trans/export.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/superseriousbusiness/gotosocial/internal/db" - transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model" + "code.superseriousbusiness.org/gotosocial/internal/db" + transmodel "code.superseriousbusiness.org/gotosocial/internal/trans/model" ) func (e *exporter) exportAccounts(ctx context.Context, where []db.Where, file *os.File) ([]*transmodel.Account, error) { diff --git a/internal/trans/exporter.go b/internal/trans/exporter.go index 54ed3cb37..09a502f08 100644 --- a/internal/trans/exporter.go +++ b/internal/trans/exporter.go @@ -20,7 +20,7 @@ package trans import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" ) // Exporter wraps functionality for exporting entries from the database to a file. diff --git a/internal/trans/exportminimal.go b/internal/trans/exportminimal.go index fea7d5af7..d57a51e69 100644 --- a/internal/trans/exportminimal.go +++ b/internal/trans/exportminimal.go @@ -23,7 +23,7 @@ import ( "fmt" "os" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" ) func (e *exporter) ExportMinimal(ctx context.Context, path string) error { diff --git a/internal/trans/exportminimal_test.go b/internal/trans/exportminimal_test.go index bacf5a47b..a5183b051 100644 --- a/internal/trans/exportminimal_test.go +++ b/internal/trans/exportminimal_test.go @@ -23,9 +23,9 @@ import ( "os" "testing" + "code.superseriousbusiness.org/gotosocial/internal/trans" "github.com/google/uuid" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/trans" ) type ExportMinimalTestSuite struct { diff --git a/internal/trans/import.go b/internal/trans/import.go index c77b439f5..b195c14fc 100644 --- a/internal/trans/import.go +++ b/internal/trans/import.go @@ -25,9 +25,9 @@ import ( "io" "os" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" - transmodel "github.com/superseriousbusiness/gotosocial/internal/trans/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" + transmodel "code.superseriousbusiness.org/gotosocial/internal/trans/model" ) func (i *importer) Import(ctx context.Context, path string) error { diff --git a/internal/trans/import_test.go b/internal/trans/import_test.go index 12094f27e..1147bfa12 100644 --- a/internal/trans/import_test.go +++ b/internal/trans/import_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/trans" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/google/uuid" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/trans" - "github.com/superseriousbusiness/gotosocial/testrig" ) type ImportMinimalTestSuite struct { diff --git a/internal/trans/importer.go b/internal/trans/importer.go index ad5bb2763..e8ef0aafb 100644 --- a/internal/trans/importer.go +++ b/internal/trans/importer.go @@ -20,7 +20,7 @@ package trans import ( "context" - "github.com/superseriousbusiness/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/db" ) // Importer wraps functionality for importing entries from a file into the database. diff --git a/internal/trans/trans_test.go b/internal/trans/trans_test.go index 1a413e6b1..55c6f1bf8 100644 --- a/internal/trans/trans_test.go +++ b/internal/trans/trans_test.go @@ -18,11 +18,11 @@ package trans_test import ( + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TransTestSuite struct { diff --git a/internal/transport/controller.go b/internal/transport/controller.go index 1010802c1..7229c216d 100644 --- a/internal/transport/controller.go +++ b/internal/transport/controller.go @@ -30,13 +30,13 @@ import ( "net/url" "code.superseriousbusiness.org/activity/pub" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/federation/federatingdb" + "code.superseriousbusiness.org/gotosocial/internal/state" "codeberg.org/gruf/go-byteutil" "codeberg.org/gruf/go-cache/v3" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" - "github.com/superseriousbusiness/gotosocial/internal/state" ) // Controller generates transports for use in making federation requests to other servers. diff --git a/internal/transport/deliver.go b/internal/transport/deliver.go index e8017b2a6..99879bcce 100644 --- a/internal/transport/deliver.go +++ b/internal/transport/deliver.go @@ -25,12 +25,12 @@ import ( "net/http" "net/url" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" ) func (t *transport) BatchDeliver(ctx context.Context, obj map[string]interface{}, recipients []*url.URL) error { diff --git a/internal/transport/delivery/delivery.go b/internal/transport/delivery/delivery.go index e11eea83c..25bc31fba 100644 --- a/internal/transport/delivery/delivery.go +++ b/internal/transport/delivery/delivery.go @@ -24,7 +24,7 @@ import ( "net/http" "time" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" ) // Delivery wraps an httpclient.Request{} diff --git a/internal/transport/delivery/delivery_test.go b/internal/transport/delivery/delivery_test.go index 81f32d5f8..9c0260d3d 100644 --- a/internal/transport/delivery/delivery_test.go +++ b/internal/transport/delivery/delivery_test.go @@ -24,9 +24,9 @@ import ( "net/http" "testing" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" ) var deliveryCases = []struct { diff --git a/internal/transport/delivery/worker.go b/internal/transport/delivery/worker.go index d6d253769..17dd8dffe 100644 --- a/internal/transport/delivery/worker.go +++ b/internal/transport/delivery/worker.go @@ -23,13 +23,13 @@ import ( "slices" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/queue" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-runners" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/queue" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // WorkerPool wraps multiple Worker{}s in diff --git a/internal/transport/delivery/worker_test.go b/internal/transport/delivery/worker_test.go index 72f485e68..42b7dc5c2 100644 --- a/internal/transport/delivery/worker_test.go +++ b/internal/transport/delivery/worker_test.go @@ -29,9 +29,9 @@ import ( "strings" "testing" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/queue" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/queue" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" ) func TestDeliveryWorkerPool(t *testing.T) { diff --git a/internal/transport/derefdomainpermlist.go b/internal/transport/derefdomainpermlist.go index ba61c8b39..30cbf9425 100644 --- a/internal/transport/derefdomainpermlist.go +++ b/internal/transport/derefdomainpermlist.go @@ -23,9 +23,9 @@ import ( "net/http" "time" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" ) type DereferenceDomainPermissionsResp struct { diff --git a/internal/transport/dereference.go b/internal/transport/dereference.go index 8cc1f2103..85a19efea 100644 --- a/internal/transport/dereference.go +++ b/internal/transport/dereference.go @@ -22,10 +22,10 @@ import ( "net/http" "net/url" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/uris" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) func (t *transport) Dereference(ctx context.Context, iri *url.URL) (*http.Response, error) { diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go index e7971093d..4c21355d6 100644 --- a/internal/transport/derefinstance.go +++ b/internal/transport/derefinstance.go @@ -28,14 +28,14 @@ import ( "slices" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/validate" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/temoto/robotstxt" ) diff --git a/internal/transport/derefmedia.go b/internal/transport/derefmedia.go index 3a05fcbd6..b8928be11 100644 --- a/internal/transport/derefmedia.go +++ b/internal/transport/derefmedia.go @@ -23,9 +23,9 @@ import ( "net/http" "net/url" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-iotools" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL, maxsz int64) (io.ReadCloser, error) { diff --git a/internal/transport/derefrobots.go b/internal/transport/derefrobots.go index d6c4f3058..14652a736 100644 --- a/internal/transport/derefrobots.go +++ b/internal/transport/derefrobots.go @@ -22,10 +22,10 @@ import ( "net/http" "net/url" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-iotools" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/temoto/robotstxt" ) diff --git a/internal/transport/finger.go b/internal/transport/finger.go index f82719245..d2f38c9c6 100644 --- a/internal/transport/finger.go +++ b/internal/transport/finger.go @@ -25,10 +25,10 @@ import ( "net/http" "net/url" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // webfingerURLFor returns the URL to try a webfinger request against, as diff --git a/internal/transport/transport.go b/internal/transport/transport.go index 2ef070541..562808a84 100644 --- a/internal/transport/transport.go +++ b/internal/transport/transport.go @@ -27,11 +27,11 @@ import ( "sync" "time" + "code.superseriousbusiness.org/gotosocial/internal/gtscontext" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" "code.superseriousbusiness.org/httpsig" - "github.com/superseriousbusiness/gotosocial/internal/gtscontext" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" ) // Transport implements the pub.Transport interface with some additional functionality for fetching remote media. diff --git a/internal/transport/transport_test.go b/internal/transport/transport_test.go index 728876129..864e3b6e4 100644 --- a/internal/transport/transport_test.go +++ b/internal/transport/transport_test.go @@ -20,18 +20,18 @@ package transport_test import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TransportTestSuite struct { diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index da4d2edb7..7125e0a03 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -24,15 +24,15 @@ import ( "net/url" "time" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/miekg/dns" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // ASRepresentationToAccount converts a remote account / person diff --git a/internal/typeutils/astointernal_test.go b/internal/typeutils/astointernal_test.go index e2fd36159..80a91fac7 100644 --- a/internal/typeutils/astointernal_test.go +++ b/internal/typeutils/astointernal_test.go @@ -26,10 +26,10 @@ import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/cache" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/cache" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ) type ASToInternalTestSuite struct { diff --git a/internal/typeutils/converter.go b/internal/typeutils/converter.go index 4fbe1dfd3..789404426 100644 --- a/internal/typeutils/converter.go +++ b/internal/typeutils/converter.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" ) type Converter struct { diff --git a/internal/typeutils/converter_test.go b/internal/typeutils/converter_test.go index f04709af5..86354016f 100644 --- a/internal/typeutils/converter_test.go +++ b/internal/typeutils/converter_test.go @@ -19,14 +19,14 @@ package typeutils_test import ( "code.superseriousbusiness.org/activity/streams/vocab" + "code.superseriousbusiness.org/gotosocial/internal/admin" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/admin" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/testrig" ) const ( diff --git a/internal/typeutils/csv.go b/internal/typeutils/csv.go index aff556021..bc6ae345c 100644 --- a/internal/typeutils/csv.go +++ b/internal/typeutils/csv.go @@ -23,11 +23,11 @@ import ( "slices" "strconv" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func (c *Converter) AccountToExportStats( diff --git a/internal/typeutils/defaulticons.go b/internal/typeutils/defaulticons.go index 1076d3476..d8075bce2 100644 --- a/internal/typeutils/defaulticons.go +++ b/internal/typeutils/defaulticons.go @@ -23,9 +23,9 @@ import ( "path/filepath" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" ) const defaultHeaderPath = "/assets/default_header.webp" diff --git a/internal/typeutils/frontendtointernal.go b/internal/typeutils/frontendtointernal.go index eb60c548e..daf64a0d2 100644 --- a/internal/typeutils/frontendtointernal.go +++ b/internal/typeutils/frontendtointernal.go @@ -22,8 +22,8 @@ import ( "net/url" "slices" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) func APIVisToVis(m apimodel.Visibility) gtsmodel.Visibility { diff --git a/internal/typeutils/internal.go b/internal/typeutils/internal.go index 573495e0a..4504168ef 100644 --- a/internal/typeutils/internal.go +++ b/internal/typeutils/internal.go @@ -22,14 +22,14 @@ import ( "errors" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" ) // FollowRequestToFollow just converts a follow request diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go index 5bb6a01df..debd93a0b 100644 --- a/internal/typeutils/internaltoas.go +++ b/internal/typeutils/internaltoas.go @@ -29,14 +29,14 @@ import ( "code.superseriousbusiness.org/activity/pub" "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" ) func accountableForActorType(actorType gtsmodel.AccountActorType) ap.Accountable { diff --git a/internal/typeutils/internaltoas_test.go b/internal/typeutils/internaltoas_test.go index 37bfa31f3..f8d69491c 100644 --- a/internal/typeutils/internaltoas_test.go +++ b/internal/typeutils/internaltoas_test.go @@ -23,11 +23,11 @@ import ( "errors" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InternalToASTestSuite struct { diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 2c662c3bd..ad6dcafea 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -28,21 +28,21 @@ import ( "strings" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/language" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-debug" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/language" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/uris" - "github.com/superseriousbusiness/gotosocial/internal/util" ) const ( @@ -51,7 +51,7 @@ const ( instancePollsMaxExpiration = 2629746 // seconds instanceAccountsMaxFeaturedTags = 10 instanceAccountsMaxProfileFields = 6 // FIXME: https://github.com/superseriousbusiness/gotosocial/issues/1876 - instanceSourceURL = "https://github.com/superseriousbusiness/gotosocial" + instanceSourceURL = "https://codeberg.org/superseriousbusiness/gotosocial" instanceMastodonVersion = "3.5.3" ) diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go index cd0ffb1f6..f38e815f9 100644 --- a/internal/typeutils/internaltofrontend_test.go +++ b/internal/typeutils/internaltofrontend_test.go @@ -24,15 +24,15 @@ import ( "strings" "testing" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - statusfilter "github.com/superseriousbusiness/gotosocial/internal/filter/status" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type InternalToFrontendTestSuite struct { @@ -2296,8 +2296,8 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV1ToFrontend() { "uri": "localhost:8080", "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", - "description": "\u003cp\u003eHere's a fuller description of the GoToSocial testrig instance.\u003c/p\u003e\u003cp\u003eThis instance is for testing purposes only. It doesn't federate at all. Go check out \u003ca href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://github.com/superseriousbusiness/gotosocial/tree/main/testrig\u003c/a\u003e and \u003ca href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\u003c/a\u003e\u003c/p\u003e\u003cp\u003eUsers on this instance:\u003c/p\u003e\u003cul\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003eadmin\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (admin!).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003e1happyturtle\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (posts about turtles, we don't know why).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003ethe_mighty_zork\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (who knows).\u003c/li\u003e\u003c/ul\u003e\u003cp\u003eIf you need to edit the models for the testrig, you can do so at \u003ccode\u003einternal/testmodels.go\u003c/code\u003e.\u003c/p\u003e", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "description": "\u003cp\u003eHere's a fuller description of the GoToSocial testrig instance.\u003c/p\u003e\u003cp\u003eThis instance is for testing purposes only. It doesn't federate at all. Go check out \u003ca href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\u003c/a\u003e and \u003ca href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\u003c/a\u003e\u003c/p\u003e\u003cp\u003eUsers on this instance:\u003c/p\u003e\u003cul\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003eadmin\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (admin!).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003e1happyturtle\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (posts about turtles, we don't know why).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003ethe_mighty_zork\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (who knows).\u003c/li\u003e\u003c/ul\u003e\u003cp\u003eIf you need to edit the models for the testrig, you can do so at \u003ccode\u003einternal/testmodels.go\u003c/code\u003e.\u003c/p\u003e", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "short_description": "\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e", "short_description_text": "This is the GoToSocial testrig. It doesn't federate or anything.\n\nWhen the testrig is shut down, all data on it will be deleted.\n\nDon't use this in production!", "email": "admin@example.org", @@ -2440,9 +2440,9 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV2ToFrontend() { "account_domain": "localhost:8080", "title": "GoToSocial Testrig Instance", "version": "0.0.0-testrig", - "source_url": "https://github.com/superseriousbusiness/gotosocial", - "description": "\u003cp\u003eHere's a fuller description of the GoToSocial testrig instance.\u003c/p\u003e\u003cp\u003eThis instance is for testing purposes only. It doesn't federate at all. Go check out \u003ca href=\"https://github.com/superseriousbusiness/gotosocial/tree/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://github.com/superseriousbusiness/gotosocial/tree/main/testrig\u003c/a\u003e and \u003ca href=\"https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\u003c/a\u003e\u003c/p\u003e\u003cp\u003eUsers on this instance:\u003c/p\u003e\u003cul\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003eadmin\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (admin!).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003e1happyturtle\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (posts about turtles, we don't know why).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003ethe_mighty_zork\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (who knows).\u003c/li\u003e\u003c/ul\u003e\u003cp\u003eIf you need to edit the models for the testrig, you can do so at \u003ccode\u003einternal/testmodels.go\u003c/code\u003e.\u003c/p\u003e", - "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", + "source_url": "https://codeberg.org/superseriousbusiness/gotosocial", + "description": "\u003cp\u003eHere's a fuller description of the GoToSocial testrig instance.\u003c/p\u003e\u003cp\u003eThis instance is for testing purposes only. It doesn't federate at all. Go check out \u003ca href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig\u003c/a\u003e and \u003ca href=\"https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003ehttps://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\u003c/a\u003e\u003c/p\u003e\u003cp\u003eUsers on this instance:\u003c/p\u003e\u003cul\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@admin\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003eadmin\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (admin!).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003e1happyturtle\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (posts about turtles, we don't know why).\u003c/li\u003e\u003cli\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:8080/@the_mighty_zork\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\"\u003e@\u003cspan\u003ethe_mighty_zork\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e (who knows).\u003c/li\u003e\u003c/ul\u003e\u003cp\u003eIf you need to edit the models for the testrig, you can do so at \u003ccode\u003einternal/testmodels.go\u003c/code\u003e.\u003c/p\u003e", + "description_text": "Here's a fuller description of the GoToSocial testrig instance.\n\nThis instance is for testing purposes only. It doesn't federate at all. Go check out https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/testrig and https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md#testing\n\nUsers on this instance:\n\n- @admin (admin!).\n- @1happyturtle (posts about turtles, we don't know why).\n- @the_mighty_zork (who knows).\n\nIf you need to edit the models for the testrig, you can do so at `+"`"+`internal/testmodels.go`+"`"+`.", "usage": { "users": { "active_month": 0 diff --git a/internal/typeutils/internaltorss.go b/internal/typeutils/internaltorss.go index 43ca7ba48..59babcb2d 100644 --- a/internal/typeutils/internaltorss.go +++ b/internal/typeutils/internaltorss.go @@ -23,12 +23,12 @@ import ( "strconv" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/text" "github.com/gorilla/feeds" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/text" ) const ( diff --git a/internal/typeutils/internaltorss_test.go b/internal/typeutils/internaltorss_test.go index 5e0d6f0c1..27d22cf81 100644 --- a/internal/typeutils/internaltorss_test.go +++ b/internal/typeutils/internaltorss_test.go @@ -22,10 +22,10 @@ import ( "encoding/xml" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type InternalToRSSTestSuite struct { diff --git a/internal/typeutils/util.go b/internal/typeutils/util.go index 17394fe49..2a0293f65 100644 --- a/internal/typeutils/util.go +++ b/internal/typeutils/util.go @@ -28,15 +28,15 @@ import ( "strconv" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/language" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/text" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/language" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/text" ) // toAPISize converts a set of media dimensions diff --git a/internal/typeutils/util_test.go b/internal/typeutils/util_test.go index ea6667519..0fbd5d192 100644 --- a/internal/typeutils/util_test.go +++ b/internal/typeutils/util_test.go @@ -21,10 +21,10 @@ import ( "context" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/language" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/language" ) func TestMisskeyReportContentURLs1(t *testing.T) { @@ -188,7 +188,7 @@ func TestFilterableText(t *testing.T) { { status: >smodel.Status{ ContentWarning: "Nerd stuff", - Content: `<p>Latest graphs for <a href="https://gts.superseriousbusiness.org/tags/gotosocial" class="mention hashtag" rel="tag nofollow noreferrer noopener" target="_blank">#<span>GoToSocial</span></a> on <a href="https://github.com/ncruces/go-sqlite3" rel="nofollow noreferrer noopener" target="_blank">Wasm sqlite3</a> with <a href="https://codeberg.org/gruf/go-ffmpreg" rel="nofollow noreferrer noopener" target="_blank">embedded Wasm ffmpeg</a>, both running on <a href="https://wazero.io/" rel="nofollow noreferrer noopener" target="_blank">Wazero</a>, and configured with a <a href="https://github.com/superseriousbusiness/gotosocial/blob/20fe430ef9ff3012a7a4dc2d01b68020c20e13bb/example/config.yaml#L259-L266" rel="nofollow noreferrer noopener" target="_blank">50MiB db cache target</a>. This is the version we'll be releasing soonish, now we're happy with how we've tamed everything.</p>`, + Content: `<p>Latest graphs for <a href="https://gts.superseriousbusiness.org/tags/gotosocial" class="mention hashtag" rel="tag nofollow noreferrer noopener" target="_blank">#<span>GoToSocial</span></a> on <a href="https://github.com/ncruces/go-sqlite3" rel="nofollow noreferrer noopener" target="_blank">Wasm sqlite3</a> with <a href="https://codeberg.org/gruf/go-ffmpreg" rel="nofollow noreferrer noopener" target="_blank">embedded Wasm ffmpeg</a>, both running on <a href="https://wazero.io/" rel="nofollow noreferrer noopener" target="_blank">Wazero</a>, and configured with a <a href="https://https://codeberg.org/superseriousbusiness/gotosocial/src/commit/20fe430ef9ff3012a7a4dc2d01b68020c20e13bb/example/config.yaml#L259-L266" rel="nofollow noreferrer noopener" target="_blank">50MiB db cache target</a>. This is the version we'll be releasing soonish, now we're happy with how we've tamed everything.</p>`, Attachments: []*gtsmodel.MediaAttachment{ { Description: `Graph showing GtS using between 150-300 MiB of memory, steadily, over a few days.`, @@ -206,7 +206,7 @@ func TestFilterableText(t *testing.T) { }, expectedFields: []string{ "Nerd stuff", - "Latest graphs for #GoToSocial <https://gts.superseriousbusiness.org/tags/gotosocial> on Wasm sqlite3 <https://github.com/ncruces/go-sqlite3> with embedded Wasm ffmpeg <https://codeberg.org/gruf/go-ffmpreg>, both running on Wazero <https://wazero.io/>, and configured with a 50MiB db cache target <https://github.com/superseriousbusiness/gotosocial/blob/20fe430ef9ff3012a7a4dc2d01b68020c20e13bb/example/config.yaml#L259-L266>. This is the version we'll be releasing soonish, now we're happy with how we've tamed everything.", + "Latest graphs for #GoToSocial <https://gts.superseriousbusiness.org/tags/gotosocial> on Wasm sqlite3 <https://github.com/ncruces/go-sqlite3> with embedded Wasm ffmpeg <https://codeberg.org/gruf/go-ffmpreg>, both running on Wazero <https://wazero.io/>, and configured with a 50MiB db cache target <https://https://codeberg.org/superseriousbusiness/gotosocial/src/commit/20fe430ef9ff3012a7a4dc2d01b68020c20e13bb/example/config.yaml#L259-L266>. This is the version we'll be releasing soonish, now we're happy with how we've tamed everything.", "Graph showing GtS using between 150-300 MiB of memory, steadily, over a few days.", "Another media attachment", "Poll option 1", diff --git a/internal/typeutils/wrap.go b/internal/typeutils/wrap.go index 0f63d1c6c..59c7e2264 100644 --- a/internal/typeutils/wrap.go +++ b/internal/typeutils/wrap.go @@ -20,10 +20,10 @@ package typeutils import ( "code.superseriousbusiness.org/activity/streams" "code.superseriousbusiness.org/activity/streams/vocab" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/id" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // WrapAccountableInUpdate wraps the given accountable diff --git a/internal/typeutils/wrap_test.go b/internal/typeutils/wrap_test.go index dde4f18b5..612b92ae8 100644 --- a/internal/typeutils/wrap_test.go +++ b/internal/typeutils/wrap_test.go @@ -22,9 +22,9 @@ import ( "encoding/json" "testing" + "code.superseriousbusiness.org/gotosocial/internal/ap" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) type WrapTestSuite struct { diff --git a/internal/uris/uri.go b/internal/uris/uri.go index e1783b26c..d4bc2d829 100644 --- a/internal/uris/uri.go +++ b/internal/uris/uri.go @@ -22,8 +22,8 @@ import ( "net/url" "strings" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/regexes" ) const ( diff --git a/internal/util/domain_test.go b/internal/util/domain_test.go index a0ffd30b4..aad1472f8 100644 --- a/internal/util/domain_test.go +++ b/internal/util/domain_test.go @@ -22,9 +22,9 @@ import ( "strconv" "testing" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type PunyTestSuite struct { diff --git a/internal/util/namestring.go b/internal/util/namestring.go index bb351c6e8..26aad821f 100644 --- a/internal/util/namestring.go +++ b/internal/util/namestring.go @@ -22,8 +22,8 @@ import ( "net/url" "strings" - "github.com/superseriousbusiness/gotosocial/internal/regexes" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/regexes" + "code.superseriousbusiness.org/gotosocial/internal/uris" ) // ExtractNamestringParts extracts the username test_user and diff --git a/internal/util/namestring_test.go b/internal/util/namestring_test.go index 2ce5af65c..9368dc7c1 100644 --- a/internal/util/namestring_test.go +++ b/internal/util/namestring_test.go @@ -20,8 +20,8 @@ package util_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type NamestringSuite struct { diff --git a/internal/util/paging.go b/internal/util/paging.go index 190f40afd..712498313 100644 --- a/internal/util/paging.go +++ b/internal/util/paging.go @@ -22,9 +22,9 @@ import ( "net/url" "strings" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // PageableResponseParams models the parameters to pass to PackagePageableResponse. diff --git a/internal/util/paging_test.go b/internal/util/paging_test.go index bab7dcb7b..f041277bc 100644 --- a/internal/util/paging_test.go +++ b/internal/util/paging_test.go @@ -20,9 +20,9 @@ package util_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/util" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/util" ) type PagingSuite struct { diff --git a/internal/util/secret_test.go b/internal/util/secret_test.go index 99b2df32c..cda5a484e 100644 --- a/internal/util/secret_test.go +++ b/internal/util/secret_test.go @@ -21,7 +21,7 @@ import ( "regexp" "testing" - "github.com/superseriousbusiness/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/util" ) func TestMustGenerateSecret(t *testing.T) { diff --git a/internal/util/time_test.go b/internal/util/time_test.go index 0af80bb92..a99e2089a 100644 --- a/internal/util/time_test.go +++ b/internal/util/time_test.go @@ -20,9 +20,9 @@ package util_test import ( "testing" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/testrig" ) type TimeSuite struct { diff --git a/internal/util/xslices/slices_test.go b/internal/util/xslices/slices_test.go index 7c62ac77f..dfa54181c 100644 --- a/internal/util/xslices/slices_test.go +++ b/internal/util/xslices/slices_test.go @@ -23,8 +23,8 @@ import ( "slices" "testing" + "code.superseriousbusiness.org/gotosocial/internal/util/xslices" "github.com/stretchr/testify/assert" - "github.com/superseriousbusiness/gotosocial/internal/util/xslices" ) func TestGrowJust(t *testing.T) { diff --git a/internal/validate/formvalidation.go b/internal/validate/formvalidation.go index 4de7636a5..08fa23dcb 100644 --- a/internal/validate/formvalidation.go +++ b/internal/validate/formvalidation.go @@ -22,10 +22,10 @@ import ( "fmt" "net/mail" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/regexes" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/regexes" pwv "github.com/wagslane/go-password-validator" "golang.org/x/text/language" ) diff --git a/internal/validate/formvalidation_test.go b/internal/validate/formvalidation_test.go index 93762cd37..c6dfdbc08 100644 --- a/internal/validate/formvalidation_test.go +++ b/internal/validate/formvalidation_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) type ValidationTestSuite struct { diff --git a/internal/web/about.go b/internal/web/about.go index 2bc558962..e899bcb84 100644 --- a/internal/web/about.go +++ b/internal/web/about.go @@ -20,11 +20,11 @@ package web import ( "context" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const ( diff --git a/internal/web/assets.go b/internal/web/assets.go index ae185354d..8e453850d 100644 --- a/internal/web/assets.go +++ b/internal/web/assets.go @@ -24,10 +24,10 @@ import ( "path/filepath" "strings" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/router" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type fileSystem struct { diff --git a/internal/web/confirmemail.go b/internal/web/confirmemail.go index 323de6bb2..9030cc463 100644 --- a/internal/web/confirmemail.go +++ b/internal/web/confirmemail.go @@ -22,10 +22,10 @@ import ( "errors" "net/http" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) confirmEmailGETHandler(c *gin.Context) { diff --git a/internal/web/customcss.go b/internal/web/customcss.go index 36ae9de55..f0c767503 100644 --- a/internal/web/customcss.go +++ b/internal/web/customcss.go @@ -20,10 +20,10 @@ package web import ( "net/http" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const textCSSUTF8 = string(apiutil.TextCSS + "; charset=utf-8") diff --git a/internal/web/domain-blocklist.go b/internal/web/domain-blocklist.go index 309e629f2..34e23d899 100644 --- a/internal/web/domain-blocklist.go +++ b/internal/web/domain-blocklist.go @@ -21,11 +21,11 @@ import ( "context" "fmt" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const ( diff --git a/internal/web/etag.go b/internal/web/etag.go index 88779871c..fcd55603b 100644 --- a/internal/web/etag.go +++ b/internal/web/etag.go @@ -24,7 +24,7 @@ import ( "io" "time" - "github.com/superseriousbusiness/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/log" "codeberg.org/gruf/go-cache/v3" ) diff --git a/internal/web/index.go b/internal/web/index.go index 02ce30138..7179e4953 100644 --- a/internal/web/index.go +++ b/internal/web/index.go @@ -22,11 +22,11 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) indexHandler(c *gin.Context) { diff --git a/internal/web/login-info.go b/internal/web/login-info.go index 9aca768b6..f1b2dd104 100644 --- a/internal/web/login-info.go +++ b/internal/web/login-info.go @@ -20,10 +20,10 @@ package web import ( "context" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) const ( diff --git a/internal/web/maintenance.go b/internal/web/maintenance.go index f05fa83dd..299139679 100644 --- a/internal/web/maintenance.go +++ b/internal/web/maintenance.go @@ -21,11 +21,11 @@ import ( "net/http" "time" + "code.superseriousbusiness.org/gotosocial/internal/api/health" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/router" "codeberg.org/gruf/go-cache/v3" "github.com/gin-gonic/gin" - "github.com/superseriousbusiness/gotosocial/internal/api/health" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/router" ) type MaintenanceModule struct { diff --git a/internal/web/profile.go b/internal/web/profile.go index dd3ed8e64..98abe5741 100644 --- a/internal/web/profile.go +++ b/internal/web/profile.go @@ -23,11 +23,11 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) type profile struct { diff --git a/internal/web/rss.go b/internal/web/rss.go index ced74ed6b..e9fa5ca65 100644 --- a/internal/web/rss.go +++ b/internal/web/rss.go @@ -23,10 +23,10 @@ import ( "strings" "time" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/log" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" ) const appRSSUTF8 = string(apiutil.AppRSSXML) + "; charset=utf-8" diff --git a/internal/web/settings-panel.go b/internal/web/settings-panel.go index 9b27fe871..1dffa8842 100644 --- a/internal/web/settings-panel.go +++ b/internal/web/settings-panel.go @@ -20,10 +20,10 @@ package web import ( "context" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) SettingsPanelHandler(c *gin.Context) { diff --git a/internal/web/signup.go b/internal/web/signup.go index a943f3680..48965a935 100644 --- a/internal/web/signup.go +++ b/internal/web/signup.go @@ -22,12 +22,12 @@ import ( "errors" "net" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/validate" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/validate" ) func (m *Module) signupGETHandler(c *gin.Context) { diff --git a/internal/web/tag.go b/internal/web/tag.go index 5c3cd31a6..e936d0603 100644 --- a/internal/web/tag.go +++ b/internal/web/tag.go @@ -20,10 +20,10 @@ package web import ( "context" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) tagGETHandler(c *gin.Context) { diff --git a/internal/web/thread.go b/internal/web/thread.go index d46e52ac7..3844bc6f3 100644 --- a/internal/web/thread.go +++ b/internal/web/thread.go @@ -24,10 +24,10 @@ import ( "net/http" "strings" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" "github.com/gin-gonic/gin" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) func (m *Module) threadGETHandler(c *gin.Context) { diff --git a/internal/web/web.go b/internal/web/web.go index 5bccca06d..ab440ab2f 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -22,14 +22,14 @@ import ( "net/http" "net/url" + apiutil "code.superseriousbusiness.org/gotosocial/internal/api/util" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/middleware" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/router" + "code.superseriousbusiness.org/gotosocial/internal/uris" "codeberg.org/gruf/go-cache/v3" "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/middleware" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/router" - "github.com/superseriousbusiness/gotosocial/internal/uris" ) const ( diff --git a/internal/webpush/realsender.go b/internal/webpush/realsender.go index d2aeaf763..0a04a2b68 100644 --- a/internal/webpush/realsender.go +++ b/internal/webpush/realsender.go @@ -27,16 +27,16 @@ import ( "strings" "time" + apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/text" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" webpushgo "github.com/SherClockHolmes/webpush-go" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/text" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) // realSender is the production Web Push sender, diff --git a/internal/webpush/realsender_test.go b/internal/webpush/realsender_test.go index 8cbe7b515..b0144d4d4 100644 --- a/internal/webpush/realsender_test.go +++ b/internal/webpush/realsender_test.go @@ -27,25 +27,25 @@ import ( // for go:linkname _ "unsafe" + "code.superseriousbusiness.org/gotosocial/internal/cleaner" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/email" + "code.superseriousbusiness.org/gotosocial/internal/federation" + "code.superseriousbusiness.org/gotosocial/internal/filter/interaction" + "code.superseriousbusiness.org/gotosocial/internal/filter/visibility" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/oauth" + "code.superseriousbusiness.org/gotosocial/internal/processing" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/storage" + "code.superseriousbusiness.org/gotosocial/internal/subscriptions" + "code.superseriousbusiness.org/gotosocial/internal/transport" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/util" + "code.superseriousbusiness.org/gotosocial/internal/webpush" + "code.superseriousbusiness.org/gotosocial/testrig" "github.com/stretchr/testify/suite" - "github.com/superseriousbusiness/gotosocial/internal/cleaner" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/email" - "github.com/superseriousbusiness/gotosocial/internal/federation" - "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" - "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/media" - "github.com/superseriousbusiness/gotosocial/internal/oauth" - "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/storage" - "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/transport" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/util" - "github.com/superseriousbusiness/gotosocial/internal/webpush" - "github.com/superseriousbusiness/gotosocial/testrig" ) type RealSenderStandardTestSuite struct { @@ -275,5 +275,5 @@ func TestRealSenderStandardTestSuite(t *testing.T) { suite.Run(t, &RealSenderStandardTestSuite{}) } -//go:linkname newSenderWith github.com/superseriousbusiness/gotosocial/internal/webpush.newSenderWith +//go:linkname newSenderWith code.superseriousbusiness.org/gotosocial/internal/webpush.newSenderWith func newSenderWith(*http.Client, *state.State, *typeutils.Converter) webpush.Sender diff --git a/internal/webpush/sender.go b/internal/webpush/sender.go index 060118019..b7bb75d41 100644 --- a/internal/webpush/sender.go +++ b/internal/webpush/sender.go @@ -21,11 +21,11 @@ import ( "context" "net/http" - "github.com/superseriousbusiness/gotosocial/internal/filter/usermute" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/httpclient" - "github.com/superseriousbusiness/gotosocial/internal/state" - "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "code.superseriousbusiness.org/gotosocial/internal/filter/usermute" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" + "code.superseriousbusiness.org/gotosocial/internal/httpclient" + "code.superseriousbusiness.org/gotosocial/internal/state" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" ) // Sender can send Web Push notifications. diff --git a/internal/workers/worker_fn.go b/internal/workers/worker_fn.go index 3f467e662..c57fcfe88 100644 --- a/internal/workers/worker_fn.go +++ b/internal/workers/worker_fn.go @@ -20,10 +20,10 @@ package workers import ( "context" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/queue" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-runners" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/queue" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // FnWorkerPool wraps multiple FnWorker{}s in diff --git a/internal/workers/worker_msg.go b/internal/workers/worker_msg.go index c7dc568d7..e038fda02 100644 --- a/internal/workers/worker_msg.go +++ b/internal/workers/worker_msg.go @@ -21,11 +21,11 @@ import ( "context" "errors" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/queue" + "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-runners" "codeberg.org/gruf/go-structr" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/queue" - "github.com/superseriousbusiness/gotosocial/internal/util" ) // MsgWorkerPool wraps multiple MsgWorker{}s in diff --git a/internal/workers/workers.go b/internal/workers/workers.go index 50ad3cce5..23898e75a 100644 --- a/internal/workers/workers.go +++ b/internal/workers/workers.go @@ -20,11 +20,11 @@ package workers import ( "runtime" - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/messages" - "github.com/superseriousbusiness/gotosocial/internal/scheduler" - "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" + "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/log" + "code.superseriousbusiness.org/gotosocial/internal/messages" + "code.superseriousbusiness.org/gotosocial/internal/scheduler" + "code.superseriousbusiness.org/gotosocial/internal/transport/delivery" ) type Workers struct { |