summaryrefslogtreecommitdiff
path: root/internal/api/client
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2023-09-23 17:44:11 +0100
committerLibravatar GitHub <noreply@github.com>2023-09-23 18:44:11 +0200
commit8f67dd583d86155440e7905ae23083a9fea42f72 (patch)
treee67abf09a53c2d9053df8072b074a026969d93ef /internal/api/client
parent[chore] fix typo in slice.go (#2219) (diff)
downloadgotosocial-8f67dd583d86155440e7905ae23083a9fea42f72.tar.xz
[chore] deinterface the typeutils.Converter and update to use state structure (#2217)
* 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
Diffstat (limited to 'internal/api/client')
-rw-r--r--internal/api/client/accounts/account_test.go3
-rw-r--r--internal/api/client/admin/admin_test.go3
-rw-r--r--internal/api/client/bookmarks/bookmarks_test.go4
-rw-r--r--internal/api/client/favourites/favourites_test.go4
-rw-r--r--internal/api/client/followrequests/followrequest_test.go3
-rw-r--r--internal/api/client/instance/instance_test.go3
-rw-r--r--internal/api/client/lists/lists_test.go3
-rw-r--r--internal/api/client/media/mediacreate_test.go4
-rw-r--r--internal/api/client/media/mediaupdate_test.go4
-rw-r--r--internal/api/client/reports/reports_test.go3
-rw-r--r--internal/api/client/search/search_test.go3
-rw-r--r--internal/api/client/statuses/status_test.go4
-rw-r--r--internal/api/client/streaming/streaming_test.go4
-rw-r--r--internal/api/client/user/user_test.go4
14 files changed, 28 insertions, 21 deletions
diff --git a/internal/api/client/accounts/account_test.go b/internal/api/client/accounts/account_test.go
index 7d8a78bff..6984f2563 100644
--- a/internal/api/client/accounts/account_test.go
+++ b/internal/api/client/accounts/account_test.go
@@ -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)
diff --git a/internal/api/client/admin/admin_test.go b/internal/api/client/admin/admin_test.go
index cca8ffa66..bb403c2d6 100644
--- a/internal/api/client/admin/admin_test.go
+++ b/internal/api/client/admin/admin_test.go
@@ -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)
diff --git a/internal/api/client/bookmarks/bookmarks_test.go b/internal/api/client/bookmarks/bookmarks_test.go
index e0b85c483..6a6fc6108 100644
--- a/internal/api/client/bookmarks/bookmarks_test.go
+++ b/internal/api/client/bookmarks/bookmarks_test.go
@@ -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,
diff --git a/internal/api/client/favourites/favourites_test.go b/internal/api/client/favourites/favourites_test.go
index 8e14a4e99..7033a8d39 100644
--- a/internal/api/client/favourites/favourites_test.go
+++ b/internal/api/client/favourites/favourites_test.go
@@ -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,
diff --git a/internal/api/client/followrequests/followrequest_test.go b/internal/api/client/followrequests/followrequest_test.go
index 51b8223bd..113950049 100644
--- a/internal/api/client/followrequests/followrequest_test.go
+++ b/internal/api/client/followrequests/followrequest_test.go
@@ -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)
diff --git a/internal/api/client/instance/instance_test.go b/internal/api/client/instance/instance_test.go
index 1ba3d72a9..116f4d4b4 100644
--- a/internal/api/client/instance/instance_test.go
+++ b/internal/api/client/instance/instance_test.go
@@ -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)
diff --git a/internal/api/client/lists/lists_test.go b/internal/api/client/lists/lists_test.go
index ebaf6998e..353306e1e 100644
--- a/internal/api/client/lists/lists_test.go
+++ b/internal/api/client/lists/lists_test.go
@@ -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)
diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go
index 2ffa8b8a1..23445607e 100644
--- a/internal/api/client/media/mediacreate_test.go
+++ b/internal/api/client/media/mediacreate_test.go
@@ -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,
diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go
index 8140f1acc..eb8266082 100644
--- a/internal/api/client/media/mediaupdate_test.go
+++ b/internal/api/client/media/mediaupdate_test.go
@@ -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,
diff --git a/internal/api/client/reports/reports_test.go b/internal/api/client/reports/reports_test.go
index cf5167816..c1986cf1f 100644
--- a/internal/api/client/reports/reports_test.go
+++ b/internal/api/client/reports/reports_test.go
@@ -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)
diff --git a/internal/api/client/search/search_test.go b/internal/api/client/search/search_test.go
index fd98a0a64..b8d0dab6c 100644
--- a/internal/api/client/search/search_test.go
+++ b/internal/api/client/search/search_test.go
@@ -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)
diff --git a/internal/api/client/statuses/status_test.go b/internal/api/client/statuses/status_test.go
index 857e04dfe..4946bb9d3 100644
--- a/internal/api/client/statuses/status_test.go
+++ b/internal/api/client/statuses/status_test.go
@@ -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,
diff --git a/internal/api/client/streaming/streaming_test.go b/internal/api/client/streaming/streaming_test.go
index c8296ef2f..87c07d8f1 100644
--- a/internal/api/client/streaming/streaming_test.go
+++ b/internal/api/client/streaming/streaming_test.go
@@ -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,
diff --git a/internal/api/client/user/user_test.go b/internal/api/client/user/user_test.go
index ded004920..db7adfd6d 100644
--- a/internal/api/client/user/user_test.go
+++ b/internal/api/client/user/user_test.go
@@ -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,
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-13 11:15:17 +0000