mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-22 12:07:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] deinterface the typeutils.Converter and update to use state structure (#2217)

Browse source 
* update typeconverter to use state structure

* deinterface the typeutils.TypeConverter -> typeutils.Converter

* finish copying over old type converter code comments

* fix cherry-pick merge issues, fix tests pointing to old typeutils interface type still
This commit is contained in:
kim 2023-09-23 17:44:11 +01:00 • committed by GitHub
commit 8f67dd583d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 611 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/api/activitypub/emoji/emojiget_test.go
View file

@ -43,7 +43,7 @@ import (
type EmojiGetTestSuite struct {
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -75,7 +75,7 @@ func (suite *EmojiGetTestSuite) SetupTest() {
suite.state.DB = suite.db
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/activitypub/users/user_test.go
View file

@ -39,7 +39,7 @@ type UserStandardTestSuite struct {
// standard suite interfaces
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -85,7 +85,7 @@ func (suite *UserStandardTestSuite) SetupTest() {
suite.db = testrig.NewTestDB(&suite.state)
suite.state.DB = suite.db
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

3
internal/api/client/accounts/account_test.go
View file

@ -36,6 +36,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -90,7 +91,7 @@ func (suite *AccountStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

3
internal/api/client/admin/admin_test.go
View file

@ -36,6 +36,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -96,7 +97,7 @@ func (suite *AdminStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

4
internal/api/client/bookmarks/bookmarks_test.go
View file

@ -50,7 +50,7 @@ type BookmarkTestSuite struct {
// standard suite interfaces
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -98,7 +98,7 @@ func (suite *BookmarkTestSuite) SetupTest() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/client/favourites/favourites_test.go
View file

@ -37,7 +37,7 @@ type FavouritesStandardTestSuite struct {
// standard suite interfaces
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -82,7 +82,7 @@ func (suite *FavouritesStandardTestSuite) SetupTest() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

3
internal/api/client/followrequests/followrequest_test.go
View file

@ -35,6 +35,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -87,7 +88,7 @@ func (suite *FollowRequestStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

3
internal/api/client/instance/instance_test.go
View file

@ -35,6 +35,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -89,7 +90,7 @@ func (suite *InstanceStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

3
internal/api/client/lists/lists_test.go
View file

@ -28,6 +28,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -88,7 +89,7 @@ func (suite *ListsStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

4
internal/api/client/media/mediacreate_test.go
View file

@ -56,7 +56,7 @@ type MediaCreateTestSuite struct {
storage *storage.Driver
mediaManager *media.Manager
federator federation.Federator
tc typeutils.TypeConverter
tc *typeutils.Converter
oauthServer oauth.Server
emailSender email.Sender
processor *processing.Processor
@ -91,7 +91,7 @@ func (suite *MediaCreateTestSuite) SetupSuite() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/client/media/mediaupdate_test.go
View file

@ -52,7 +52,7 @@ type MediaUpdateTestSuite struct {
db db.DB
storage *storage.Driver
federator federation.Federator
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
oauthServer oauth.Server
emailSender email.Sender
@ -87,7 +87,7 @@ func (suite *MediaUpdateTestSuite) SetupSuite() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

3
internal/api/client/reports/reports_test.go
View file

@ -28,6 +28,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -81,7 +82,7 @@ func (suite *ReportsStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

3
internal/api/client/search/search_test.go
View file

@ -35,6 +35,7 @@ import (
"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/internal/visibility"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@ -85,7 +86,7 @@ func (suite *SearchStandardTestSuite) SetupTest() {
testrig.StartTimelines(
&suite.state,
visibility.NewFilter(&suite.state),
testrig.NewTestTypeConverter(suite.db),
typeutils.NewConverter(&suite.state),
)
suite.mediaManager = testrig.NewTestMediaManager(&suite.state)

4
internal/api/client/statuses/status_test.go
View file

@ -37,7 +37,7 @@ type StatusStandardTestSuite struct {
// standard suite interfaces
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -82,7 +82,7 @@ func (suite *StatusStandardTestSuite) SetupTest() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/client/streaming/streaming_test.go
View file

@ -49,7 +49,7 @@ type StreamingTestSuite struct {
// standard suite interfaces
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -94,7 +94,7 @@ func (suite *StreamingTestSuite) SetupTest() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/client/user/user_test.go
View file

@ -36,7 +36,7 @@ import (
type UserStandardTestSuite struct {
suite.Suite
db db.DB
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -73,7 +73,7 @@ func (suite *UserStandardTestSuite) SetupTest() {
suite.storage = testrig.NewInMemoryStorage()
suite.state.Storage = suite.storage
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/fileserver/fileserver_test.go
View file

@ -42,7 +42,7 @@ type FileserverTestSuite struct {
storage *storage.Driver
state state.State
federator federation.Federator
tc typeutils.TypeConverter
tc *typeutils.Converter
processor *processing.Processor
mediaManager *media.Manager
oauthServer oauth.Server
@ -79,7 +79,7 @@ func (suite *FileserverTestSuite) SetupSuite() {
suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../testrig/media")), suite.mediaManager)
suite.processor = testrig.NewTestProcessor(&suite.state, suite.federator, suite.emailSender, suite.mediaManager)
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,

4
internal/api/wellknown/webfinger/webfinger_test.go
View file

@ -39,7 +39,7 @@ type WebfingerStandardTestSuite struct {
suite.Suite
db db.DB
state state.State
tc typeutils.TypeConverter
tc *typeutils.Converter
mediaManager *media.Manager
federator federation.Federator
emailSender email.Sender
@ -79,7 +79,7 @@ func (suite *WebfingerStandardTestSuite) SetupTest() {
suite.db = testrig.NewTestDB(&suite.state)
suite.state.DB = suite.db
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.tc = typeutils.NewConverter(&suite.state)
testrig.StartTimelines(
&suite.state,