diff options
author | 2025-01-30 09:40:21 +0000 | |
---|---|---|
committer | 2025-01-30 10:40:21 +0100 | |
commit | 1ab960bf151d7b6440ee8611041447894abbc458 (patch) | |
tree | c70468864c2eab544d596b2309d1b01f1ce93971 /internal/federation/dereferencing/dereferencer_test.go | |
parent | [feature] Use maintenance router to serve 503 while server is starting/migrat... (diff) | |
download | gotosocial-1ab960bf151d7b6440ee8611041447894abbc458.tar.xz |
[bugfix] harden checks for remotes masquerading as local, and return correct local account redirects early (#3706)
Diffstat (limited to 'internal/federation/dereferencing/dereferencer_test.go')
-rw-r--r-- | internal/federation/dereferencing/dereferencer_test.go | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/internal/federation/dereferencing/dereferencer_test.go b/internal/federation/dereferencing/dereferencer_test.go index 9878a1b50..f7627eca0 100644 --- a/internal/federation/dereferencing/dereferencer_test.go +++ b/internal/federation/dereferencing/dereferencer_test.go @@ -26,6 +26,7 @@ import ( "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" @@ -34,10 +35,14 @@ import ( type DereferencerStandardTestSuite struct { suite.Suite - db db.DB - storage *storage.Driver - state state.State - client *testrig.MockHTTPClient + db db.DB + storage *storage.Driver + state state.State + client *testrig.MockHTTPClient + converter *typeutils.Converter + visFilter *visibility.Filter + intFilter *interaction.Filter + media *media.Manager testRemoteStatuses map[string]vocab.ActivityStreamsNote testRemotePeople map[string]vocab.ActivityStreamsPerson @@ -67,12 +72,15 @@ func (suite *DereferencerStandardTestSuite) SetupTest() { suite.db = testrig.NewTestDB(&suite.state) - converter := typeutils.NewConverter(&suite.state) + suite.converter = typeutils.NewConverter(&suite.state) + suite.visFilter = visibility.NewFilter(&suite.state) + suite.intFilter = interaction.NewFilter(&suite.state) + suite.media = testrig.NewTestMediaManager(&suite.state) testrig.StartTimelines( &suite.state, - visibility.NewFilter(&suite.state), - converter, + suite.visFilter, + suite.converter, ) suite.client = testrig.NewMockHTTPClient(nil, "../../../testrig/media") @@ -81,19 +89,16 @@ func (suite *DereferencerStandardTestSuite) SetupTest() { suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) suite.state.Storage = suite.storage - visFilter := visibility.NewFilter(&suite.state) - intFilter := interaction.NewFilter(&suite.state) - media := testrig.NewTestMediaManager(&suite.state) suite.dereferencer = dereferencing.NewDereferencer( &suite.state, - converter, + suite.converter, testrig.NewTestTransportController( &suite.state, suite.client, ), - visFilter, - intFilter, - media, + suite.visFilter, + suite.intFilter, + suite.media, ) testrig.StandardDBSetup(suite.db, nil) } |