mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 12:52:25 -05:00 
			
		
		
		
	remove references to old timeline types that needed starting up in tests
This commit is contained in:
		
					parent
					
						
							
								566e2b1d38
							
						
					
				
			
			
				commit
				
					
						e96bf44497
					
				
			
		
					 43 changed files with 38 additions and 364 deletions
				
			
		|  | @ -30,7 +30,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/middleware" | 	"github.com/superseriousbusiness/gotosocial/internal/middleware" | ||||||
|  | @ -79,12 +78,6 @@ func (suite *EmojiGetTestSuite) SetupTest() { | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | ||||||
|  |  | ||||||
|  | @ -25,7 +25,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/middleware" | 	"github.com/superseriousbusiness/gotosocial/internal/middleware" | ||||||
|  | @ -86,12 +85,6 @@ func (suite *UserStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
|  | @ -31,14 +31,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -88,12 +86,6 @@ func (suite *AccountStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -31,14 +31,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -94,12 +92,6 @@ func (suite *AdminStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -36,7 +36,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -100,12 +99,6 @@ func (suite *BookmarkTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -29,11 +29,9 @@ import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/client/exports" | 	"github.com/superseriousbusiness/gotosocial/internal/api/client/exports" | ||||||
| 	apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" | 	apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -69,12 +67,6 @@ func (suite *ExportsTestSuite) SetupTest() { | ||||||
| 	suite.state.DB = testrig.NewTestDB(&suite.state) | 	suite.state.DB = testrig.NewTestDB(&suite.state) | ||||||
| 	suite.state.Storage = testrig.NewInMemoryStorage() | 	suite.state.Storage = testrig.NewInMemoryStorage() | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.state.DB, nil) | 	testrig.StandardDBSetup(suite.state.DB, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.state.Storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.state.Storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -24,7 +24,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
|  | @ -84,12 +83,6 @@ func (suite *FavouritesStandardTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -29,14 +29,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/stream" | 	"github.com/superseriousbusiness/gotosocial/internal/stream" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -93,12 +91,6 @@ func (suite *FiltersTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -29,14 +29,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/stream" | 	"github.com/superseriousbusiness/gotosocial/internal/stream" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -93,12 +91,6 @@ func (suite *FiltersTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.emailSender = testrig.NewEmailSender("../../../../../web/template/", suite.sentEmails) | 	suite.emailSender = testrig.NewEmailSender("../../../../../web/template/", suite.sentEmails) | ||||||
|  |  | ||||||
|  | @ -30,14 +30,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -85,12 +83,6 @@ func (suite *FollowRequestStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | ||||||
|  |  | ||||||
|  | @ -28,11 +28,9 @@ import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 
 | 
 | ||||||
| 	importdata "github.com/superseriousbusiness/gotosocial/internal/api/client/import" | 	importdata "github.com/superseriousbusiness/gotosocial/internal/api/client/import" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -67,12 +65,6 @@ func (suite *ImportTestSuite) SetupTest() { | ||||||
| 	suite.state.DB = testrig.NewTestDB(&suite.state) | 	suite.state.DB = testrig.NewTestDB(&suite.state) | ||||||
| 	suite.state.Storage = testrig.NewInMemoryStorage() | 	suite.state.Storage = testrig.NewInMemoryStorage() | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.state.DB, nil) | 	testrig.StandardDBSetup(suite.state.DB, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.state.Storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.state.Storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -30,14 +30,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -87,12 +85,6 @@ func (suite *InstanceStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -24,13 +24,11 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -90,12 +88,6 @@ func (suite *ListsStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) | ||||||
|  |  | ||||||
|  | @ -36,7 +36,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -93,12 +92,6 @@ func (suite *MediaCreateTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
|  |  | ||||||
|  | @ -34,7 +34,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -91,12 +90,6 @@ func (suite *MediaUpdateTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
|  |  | ||||||
|  | @ -31,14 +31,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -84,12 +82,6 @@ func (suite *MutesTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -24,7 +24,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
|  | @ -86,12 +85,6 @@ func (suite *NotificationsTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -24,13 +24,11 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -80,12 +78,6 @@ func (suite *PollsStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -24,13 +24,11 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -79,12 +77,6 @@ func (suite *ReportsStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -30,14 +30,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -83,12 +81,6 @@ func (suite *SearchStandardTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -30,7 +30,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/id" | 	"github.com/superseriousbusiness/gotosocial/internal/id" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
|  | @ -197,12 +196,6 @@ func (suite *StatusStandardTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -36,7 +36,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -97,12 +96,6 @@ func (suite *StreamingTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -28,7 +28,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/client/user" | 	"github.com/superseriousbusiness/gotosocial/internal/api/client/user" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -77,12 +76,6 @@ func (suite *UserStandardTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator( | 	suite.federator = testrig.NewTestFederator( | ||||||
| 		&suite.state, | 		&suite.state, | ||||||
|  |  | ||||||
|  | @ -24,7 +24,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/log" | 	"github.com/superseriousbusiness/gotosocial/internal/log" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
|  | @ -92,12 +91,6 @@ func (suite *FileserverTestSuite) SetupSuite() { | ||||||
| 
 | 
 | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | 	suite.oauthServer = testrig.NewTestOauthServer(&suite.state) | ||||||
| 	suite.emailSender = testrig.NewEmailSender("../../../web/template/", nil) | 	suite.emailSender = testrig.NewEmailSender("../../../web/template/", nil) | ||||||
|  |  | ||||||
|  | @ -24,7 +24,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||||
|  | @ -81,12 +80,6 @@ func (suite *WebfingerStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
							
								
								
									
										18
									
								
								internal/cache/timeline/status.go
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								internal/cache/timeline/status.go
									
										
									
									
										vendored
									
									
								
							|  | @ -164,16 +164,6 @@ func (t *StatusTimelines) InsertInto(key string, statuses ...*gtsmodel.Status) { | ||||||
| 	t.MustGet(key).Insert(statuses...) | 	t.MustGet(key).Insert(statuses...) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Insert allows you to bulk insert many statuses into *all* mapped timelines. |  | ||||||
| func (t *StatusTimelines) Insert(statuses ...*gtsmodel.Status) { |  | ||||||
| 	meta := toStatusMeta(statuses) |  | ||||||
| 	if p := t.ptr.Load(); p != nil { |  | ||||||
| 		for _, tt := range *p { |  | ||||||
| 			tt.cache.Insert(meta...) |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // RemoveByStatusIDs ... | // RemoveByStatusIDs ... | ||||||
| func (t *StatusTimelines) RemoveByStatusIDs(statusIDs ...string) { | func (t *StatusTimelines) RemoveByStatusIDs(statusIDs ...string) { | ||||||
| 	if p := t.ptr.Load(); p != nil { | 	if p := t.ptr.Load(); p != nil { | ||||||
|  | @ -258,7 +248,13 @@ type StatusTimeline struct { | ||||||
| 	idx_BoostOfID        *structr.Index //nolint:revive | 	idx_BoostOfID        *structr.Index //nolint:revive | ||||||
| 	idx_BoostOfAccountID *structr.Index //nolint:revive | 	idx_BoostOfAccountID *structr.Index //nolint:revive | ||||||
| 
 | 
 | ||||||
| 	// ... | 	// last stores the last fetched direction | ||||||
|  | 	// of the timeline, which in turn determines | ||||||
|  | 	// where we will next trim from in keeping the | ||||||
|  | 	// timeline underneath configured 'max'. | ||||||
|  | 	// | ||||||
|  | 	// TODO: this could be more intelligent with | ||||||
|  | 	// a sliding average. a problem for future kim! | ||||||
| 	last atomic.Pointer[structr.Direction] | 	last atomic.Pointer[structr.Direction] | ||||||
| 
 | 
 | ||||||
| 	// ... | 	// ... | ||||||
|  |  | ||||||
|  | @ -29,14 +29,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/admin" | 	"github.com/superseriousbusiness/gotosocial/internal/admin" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/cleaner" | 	"github.com/superseriousbusiness/gotosocial/internal/cleaner" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/transport" | 	"github.com/superseriousbusiness/gotosocial/internal/transport" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -74,12 +72,6 @@ func (suite *MediaTestSuite) SetupTest() { | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../testrig/media") | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.testAttachments = testrig.NewTestAttachments() | 	suite.testAttachments = testrig.NewTestAttachments() | ||||||
| 	suite.testAccounts = testrig.NewTestAccounts() | 	suite.testAccounts = testrig.NewTestAccounts() | ||||||
| 	suite.testEmojis = testrig.NewTestEmojis() | 	suite.testEmojis = testrig.NewTestEmojis() | ||||||
|  |  | ||||||
|  | @ -20,10 +20,8 @@ package bundb_test | ||||||
| import ( | import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -90,8 +88,6 @@ func (suite *BunDBStandardTestSuite) SetupTest() { | ||||||
| 	testrig.InitTestLog() | 	testrig.InitTestLog() | ||||||
| 	suite.state.Caches.Init() | 	suite.state.Caches.Init() | ||||||
| 	suite.db = testrig.NewTestDB(&suite.state) | 	suite.db = testrig.NewTestDB(&suite.state) | ||||||
| 	converter := typeutils.NewConverter(&suite.state) |  | ||||||
| 	testrig.StartTimelines(&suite.state, visibility.NewFilter(&suite.state), converter) |  | ||||||
| 	testrig.StandardDBSetup(suite.db, suite.testAccounts) | 	testrig.StandardDBSetup(suite.db, suite.testAccounts) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -22,12 +22,12 @@ import ( | ||||||
| 	"testing" | 	"testing" | ||||||
| 	"time" | 	"time" | ||||||
| 
 | 
 | ||||||
| 	"codeberg.org/gruf/go-kv" |  | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/ap" | 	"github.com/superseriousbusiness/gotosocial/internal/ap" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/id" | 	"github.com/superseriousbusiness/gotosocial/internal/id" | ||||||
|  | 	"github.com/superseriousbusiness/gotosocial/internal/paging" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/util" | 	"github.com/superseriousbusiness/gotosocial/internal/util" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -124,59 +124,32 @@ func (suite *TimelineTestSuite) checkStatuses(statuses []*gtsmodel.Status, maxID | ||||||
| func (suite *TimelineTestSuite) TestGetPublicTimeline() { | func (suite *TimelineTestSuite) TestGetPublicTimeline() { | ||||||
| 	ctx := context.Background() | 	ctx := context.Background() | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetPublicTimeline(ctx, "", "", "", 20, false) | 	s, err := suite.db.GetPublicTimeline(ctx, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	suite.T().Log(kv.Field{ |  | ||||||
| 		K: "statuses", V: s, |  | ||||||
| 	}) |  | ||||||
| 
 |  | ||||||
| 	suite.checkStatuses(s, id.Highest, id.Lowest, suite.publicCount()) | 	suite.checkStatuses(s, id.Highest, id.Lowest, suite.publicCount()) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (suite *TimelineTestSuite) TestGetPublicTimelineLocal() { | func (suite *TimelineTestSuite) TestGetPublicTimelineLocal() { | ||||||
| 	ctx := context.Background() | 	ctx := context.Background() | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetPublicTimeline(ctx, "", "", "", 20, true) | 	s, err := suite.db.GetLocalTimeline(ctx, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	suite.T().Log(kv.Field{ |  | ||||||
| 		K: "statuses", V: s, |  | ||||||
| 	}) |  | ||||||
| 
 |  | ||||||
| 	suite.checkStatuses(s, id.Highest, id.Lowest, suite.localCount()) | 	suite.checkStatuses(s, id.Highest, id.Lowest, suite.localCount()) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (suite *TimelineTestSuite) TestGetPublicTimelineWithFutureStatus() { |  | ||||||
| 	ctx := context.Background() |  | ||||||
| 
 |  | ||||||
| 	// Insert a status set far in the |  | ||||||
| 	// future, it shouldn't be retrieved. |  | ||||||
| 	futureStatus := getFutureStatus() |  | ||||||
| 	if err := suite.db.PutStatus(ctx, futureStatus); err != nil { |  | ||||||
| 		suite.FailNow(err.Error()) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	s, err := suite.db.GetPublicTimeline(ctx, "", "", "", 20, false) |  | ||||||
| 	if err != nil { |  | ||||||
| 		suite.FailNow(err.Error()) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	suite.NotContains(s, futureStatus) |  | ||||||
| 	suite.checkStatuses(s, id.Highest, id.Lowest, suite.publicCount()) |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| func (suite *TimelineTestSuite) TestGetHomeTimeline() { | func (suite *TimelineTestSuite) TestGetHomeTimeline() { | ||||||
| 	var ( | 	var ( | ||||||
| 		ctx            = context.Background() | 		ctx            = context.Background() | ||||||
| 		viewingAccount = suite.testAccounts["local_account_1"] | 		viewingAccount = suite.testAccounts["local_account_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", "", 20, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -203,7 +176,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() { | ||||||
| 
 | 
 | ||||||
| 	// First try with list just set to exclusive. | 	// First try with list just set to exclusive. | ||||||
| 	// We should only get zork's own statuses. | 	// We should only get zork's own statuses. | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", "", 20, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -217,7 +190,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() { | ||||||
| 
 | 
 | ||||||
| 	// Zork should only see their own | 	// Zork should only see their own | ||||||
| 	// statuses and admin's statuses now. | 	// statuses and admin's statuses now. | ||||||
| 	s, err = suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", "", 20, false) | 	s, err = suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -248,7 +221,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineNoFollowing() { | ||||||
| 
 | 
 | ||||||
| 	// Query should work fine; though far | 	// Query should work fine; though far | ||||||
| 	// fewer statuses will be returned ofc. | 	// fewer statuses will be returned ofc. | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", "", 20, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -269,7 +242,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineWithFutureStatus() { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", "", 20, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -284,7 +257,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineBackToFront() { | ||||||
| 		viewingAccount = suite.testAccounts["local_account_1"] | 		viewingAccount = suite.testAccounts["local_account_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, "", "", id.Lowest, 5, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage("", "", id.Lowest, 5)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -300,7 +273,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineFromHighest() { | ||||||
| 		viewingAccount = suite.testAccounts["local_account_1"] | 		viewingAccount = suite.testAccounts["local_account_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, id.Highest, "", "", 5, false) | 	s, err := suite.db.GetHomeTimeline(ctx, viewingAccount.ID, toPage(id.Highest, "", "", 5)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -316,7 +289,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineNoParams() { | ||||||
| 		list = suite.testLists["local_account_1_list_1"] | 		list = suite.testLists["local_account_1_list_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetListTimeline(ctx, list.ID, "", "", "", 20) | 	s, err := suite.db.GetListTimeline(ctx, list.ID, toPage("", "", "", 20)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -330,7 +303,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMaxID() { | ||||||
| 		list = suite.testLists["local_account_1_list_1"] | 		list = suite.testLists["local_account_1_list_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetListTimeline(ctx, list.ID, id.Highest, "", "", 5) | 	s, err := suite.db.GetListTimeline(ctx, list.ID, toPage(id.Highest, "", "", 5)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -346,7 +319,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMinID() { | ||||||
| 		list = suite.testLists["local_account_1_list_1"] | 		list = suite.testLists["local_account_1_list_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetListTimeline(ctx, list.ID, "", "", id.Lowest, 5) | 	s, err := suite.db.GetListTimeline(ctx, list.ID, toPage("", "", id.Lowest, 5)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -362,7 +335,7 @@ func (suite *TimelineTestSuite) TestGetListTimelineMinIDPagingUp() { | ||||||
| 		list = suite.testLists["local_account_1_list_1"] | 		list = suite.testLists["local_account_1_list_1"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetListTimeline(ctx, list.ID, "", "", "01F8MHC8VWDRBQR0N1BATDDEM5", 5) | 	s, err := suite.db.GetListTimeline(ctx, list.ID, toPage("", "", "01F8MHC8VWDRBQR0N1BATDDEM5", 5)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -378,7 +351,7 @@ func (suite *TimelineTestSuite) TestGetTagTimelineNoParams() { | ||||||
| 		tag = suite.testTags["welcome"] | 		tag = suite.testTags["welcome"] | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| 	s, err := suite.db.GetTagTimeline(ctx, tag.ID, "", "", "", 1) | 	s, err := suite.db.GetTagTimeline(ctx, tag.ID, toPage("", "", "", 1)) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		suite.FailNow(err.Error()) | 		suite.FailNow(err.Error()) | ||||||
| 	} | 	} | ||||||
|  | @ -390,3 +363,19 @@ func (suite *TimelineTestSuite) TestGetTagTimelineNoParams() { | ||||||
| func TestTimelineTestSuite(t *testing.T) { | func TestTimelineTestSuite(t *testing.T) { | ||||||
| 	suite.Run(t, new(TimelineTestSuite)) | 	suite.Run(t, new(TimelineTestSuite)) | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | // toPage is a helper function to wrap a series of paging arguments in paging.Page{}. | ||||||
|  | func toPage(maxID, sinceID, minID string, limit int) *paging.Page { | ||||||
|  | 	var pg paging.Page | ||||||
|  | 	pg.Limit = limit | ||||||
|  | 
 | ||||||
|  | 	if maxID != "" { | ||||||
|  | 		pg.Max = paging.MaxID(maxID) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	if sinceID != "" || minID != "" { | ||||||
|  | 		pg.Min = paging.EitherMinID(minID, sinceID) | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return &pg | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @ -77,12 +77,6 @@ func (suite *DereferencerStandardTestSuite) SetupTest() { | ||||||
| 	suite.intFilter = interaction.NewFilter(&suite.state) | 	suite.intFilter = interaction.NewFilter(&suite.state) | ||||||
| 	suite.media = testrig.NewTestMediaManager(&suite.state) | 	suite.media = testrig.NewTestMediaManager(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		suite.visFilter, |  | ||||||
| 		suite.converter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.client = testrig.NewMockHTTPClient(nil, "../../../testrig/media") | 	suite.client = testrig.NewMockHTTPClient(nil, "../../../testrig/media") | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.DB = suite.db | 	suite.state.DB = suite.db | ||||||
|  |  | ||||||
|  | @ -25,7 +25,6 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/admin" | 	"github.com/superseriousbusiness/gotosocial/internal/admin" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" | 	"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/messages" | 	"github.com/superseriousbusiness/gotosocial/internal/messages" | ||||||
|  | @ -80,12 +79,6 @@ func (suite *FederatingDBTestSuite) SetupTest() { | ||||||
| 	suite.testActivities = testrig.NewTestActivities(suite.testAccounts) | 	suite.testActivities = testrig.NewTestActivities(suite.testAccounts) | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.federatingDB = testrig.NewTestFederatingDB(&suite.state) | 	suite.federatingDB = testrig.NewTestFederatingDB(&suite.state) | ||||||
| 	testrig.StandardDBSetup(suite.db, suite.testAccounts) | 	testrig.StandardDBSetup(suite.db, suite.testAccounts) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -23,7 +23,6 @@ import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 
 | 
 | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
|  | @ -67,12 +66,6 @@ func (suite *FederatorStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.typeconverter = typeutils.NewConverter(&suite.state) | 	suite.typeconverter = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.typeconverter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	// Ensure it's possible to deref | 	// Ensure it's possible to deref | ||||||
| 	// main key of foss satan. | 	// main key of foss satan. | ||||||
| 	fossSatanAS, err := suite.typeconverter.AccountToAS(context.Background(), suite.testAccounts["remote_account_1"]) | 	fossSatanAS, err := suite.typeconverter.AccountToAS(context.Background(), suite.testAccounts["remote_account_1"]) | ||||||
|  |  | ||||||
|  | @ -21,13 +21,11 @@ import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/admin" | 	"github.com/superseriousbusiness/gotosocial/internal/admin" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/transport" | 	"github.com/superseriousbusiness/gotosocial/internal/transport" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -60,12 +58,6 @@ func (suite *MediaStandardTestSuite) SetupTest() { | ||||||
| 	testrig.StandardStorageSetup(suite.storage, "../../testrig/media") | 	testrig.StandardStorageSetup(suite.storage, "../../testrig/media") | ||||||
| 	testrig.StandardDBSetup(suite.db, nil) | 	testrig.StandardDBSetup(suite.db, nil) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.testAttachments = testrig.NewTestAttachments() | 	suite.testAttachments = testrig.NewTestAttachments() | ||||||
| 	suite.testAccounts = testrig.NewTestAccounts() | 	suite.testAccounts = testrig.NewTestAccounts() | ||||||
| 	suite.testEmojis = testrig.NewTestEmojis() | 	suite.testEmojis = testrig.NewTestEmojis() | ||||||
|  |  | ||||||
|  | @ -95,12 +95,6 @@ func (suite *AccountStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | 	suite.state.AdminActions = admin.New(suite.state.DB, &suite.state.Workers) | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
|  | @ -92,12 +92,6 @@ func (suite *AdminStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.AdminActions = adminactions.New(suite.state.DB, &suite.state.Workers) | 	suite.state.AdminActions = adminactions.New(suite.state.DB, &suite.state.Workers) | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
|  | @ -106,12 +106,6 @@ func (suite *ConversationsTestSuite) SetupTest() { | ||||||
| 	suite.tc = typeutils.NewConverter(&suite.state) | 	suite.tc = typeutils.NewConverter(&suite.state) | ||||||
| 	suite.filter = visibility.NewFilter(&suite.state) | 	suite.filter = visibility.NewFilter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		suite.filter, |  | ||||||
| 		suite.tc, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
|  | @ -109,12 +109,6 @@ func (suite *ProcessingStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.typeconverter = typeutils.NewConverter(&suite.state) | 	suite.typeconverter = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.typeconverter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.httpClient = testrig.NewMockHTTPClient(nil, "../../testrig/media") | 	suite.httpClient = testrig.NewMockHTTPClient(nil, "../../testrig/media") | ||||||
| 	suite.httpClient.TestRemotePeople = testrig.NewTestFediPeople() | 	suite.httpClient.TestRemotePeople = testrig.NewTestFediPeople() | ||||||
| 	suite.httpClient.TestRemoteStatuses = testrig.NewTestFediStatuses() | 	suite.httpClient.TestRemoteStatuses = testrig.NewTestFediStatuses() | ||||||
|  |  | ||||||
|  | @ -93,11 +93,6 @@ func (suite *StatusStandardTestSuite) SetupTest() { | ||||||
| 
 | 
 | ||||||
| 	visFilter := visibility.NewFilter(&suite.state) | 	visFilter := visibility.NewFilter(&suite.state) | ||||||
| 	intFilter := interaction.NewFilter(&suite.state) | 	intFilter := interaction.NewFilter(&suite.state) | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visFilter, |  | ||||||
| 		suite.typeConverter, |  | ||||||
| 	) |  | ||||||
| 
 | 
 | ||||||
| 	common := common.New(&suite.state, suite.mediaManager, suite.typeConverter, suite.federator, visFilter) | 	common := common.New(&suite.state, suite.mediaManager, suite.typeConverter, suite.federator, visFilter) | ||||||
| 	polls := polls.New(&common, &suite.state, suite.typeConverter) | 	polls := polls.New(&common, &suite.state, suite.typeConverter) | ||||||
|  |  | ||||||
|  | @ -25,14 +25,12 @@ import ( | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/storage" | 	"github.com/superseriousbusiness/gotosocial/internal/storage" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/transport" | 	"github.com/superseriousbusiness/gotosocial/internal/transport" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | @ -77,12 +75,6 @@ func (suite *TransportTestSuite) SetupTest() { | ||||||
| 	suite.storage = testrig.NewInMemoryStorage() | 	suite.storage = testrig.NewInMemoryStorage() | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		typeutils.NewConverter(&suite.state), |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | 	suite.mediaManager = testrig.NewTestMediaManager(&suite.state) | ||||||
| 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../testrig/media")), suite.mediaManager) | 	suite.federator = testrig.NewTestFederator(&suite.state, testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../testrig/media")), suite.mediaManager) | ||||||
| 	suite.sentEmails = make(map[string]string) | 	suite.sentEmails = make(map[string]string) | ||||||
|  |  | ||||||
|  | @ -22,7 +22,6 @@ import ( | ||||||
| 	"github.com/stretchr/testify/suite" | 	"github.com/stretchr/testify/suite" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/admin" | 	"github.com/superseriousbusiness/gotosocial/internal/admin" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
|  | @ -529,12 +528,6 @@ func (suite *TypeUtilsTestSuite) TearDownTest() { | ||||||
| // GetProcessor is a utility function that instantiates a processor. | // GetProcessor is a utility function that instantiates a processor. | ||||||
| // Useful when a test in the test suite needs to change some state. | // Useful when a test in the test suite needs to change some state. | ||||||
| func (suite *TypeUtilsTestSuite) GetProcessor() *processing.Processor { | func (suite *TypeUtilsTestSuite) GetProcessor() *processing.Processor { | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.typeconverter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	httpClient := testrig.NewMockHTTPClient(nil, "../../testrig/media") | 	httpClient := testrig.NewMockHTTPClient(nil, "../../testrig/media") | ||||||
| 	transportController := testrig.NewTestTransportController(&suite.state, httpClient) | 	transportController := testrig.NewTestTransportController(&suite.state, httpClient) | ||||||
| 	mediaManager := testrig.NewTestMediaManager(&suite.state) | 	mediaManager := testrig.NewTestMediaManager(&suite.state) | ||||||
|  |  | ||||||
|  | @ -90,12 +90,6 @@ func (suite *RealSenderStandardTestSuite) SetupTest() { | ||||||
| 	suite.state.Storage = suite.storage | 	suite.state.Storage = suite.storage | ||||||
| 	suite.typeconverter = typeutils.NewConverter(&suite.state) | 	suite.typeconverter = typeutils.NewConverter(&suite.state) | ||||||
| 
 | 
 | ||||||
| 	testrig.StartTimelines( |  | ||||||
| 		&suite.state, |  | ||||||
| 		visibility.NewFilter(&suite.state), |  | ||||||
| 		suite.typeconverter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	suite.httpClient = testrig.NewMockHTTPClient(nil, "../../testrig/media") | 	suite.httpClient = testrig.NewMockHTTPClient(nil, "../../testrig/media") | ||||||
| 	suite.httpClient.TestRemotePeople = testrig.NewTestFediPeople() | 	suite.httpClient.TestRemotePeople = testrig.NewTestFediPeople() | ||||||
| 	suite.httpClient.TestRemoteStatuses = testrig.NewTestFediStatuses() | 	suite.httpClient.TestRemoteStatuses = testrig.NewTestFediStatuses() | ||||||
|  |  | ||||||
|  | @ -69,12 +69,6 @@ func SetupTestStructs( | ||||||
| 	visFilter := visibility.NewFilter(&state) | 	visFilter := visibility.NewFilter(&state) | ||||||
| 	intFilter := interaction.NewFilter(&state) | 	intFilter := interaction.NewFilter(&state) | ||||||
| 
 | 
 | ||||||
| 	StartTimelines( |  | ||||||
| 		&state, |  | ||||||
| 		visFilter, |  | ||||||
| 		typeconverter, |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	httpClient := NewMockHTTPClient(nil, rMediaPath) | 	httpClient := NewMockHTTPClient(nil, rMediaPath) | ||||||
| 	httpClient.TestRemotePeople = NewTestFediPeople() | 	httpClient.TestRemotePeople = NewTestFediPeople() | ||||||
| 	httpClient.TestRemoteStatuses = NewTestFediStatuses() | 	httpClient.TestRemoteStatuses = NewTestFediStatuses() | ||||||
|  |  | ||||||
|  | @ -20,7 +20,6 @@ package testrig | ||||||
| import ( | import ( | ||||||
| 	"bytes" | 	"bytes" | ||||||
| 	"context" | 	"context" | ||||||
| 	"fmt" |  | ||||||
| 	"io" | 	"io" | ||||||
| 	"mime/multipart" | 	"mime/multipart" | ||||||
| 	"net/url" | 	"net/url" | ||||||
|  | @ -30,14 +29,10 @@ import ( | ||||||
| 
 | 
 | ||||||
| 	"codeberg.org/gruf/go-byteutil" | 	"codeberg.org/gruf/go-byteutil" | ||||||
| 	"codeberg.org/gruf/go-kv/format" | 	"codeberg.org/gruf/go-kv/format" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/filter/visibility" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/log" | 	"github.com/superseriousbusiness/gotosocial/internal/log" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/messages" | 	"github.com/superseriousbusiness/gotosocial/internal/messages" | ||||||
| 	tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing/workers" | 	"github.com/superseriousbusiness/gotosocial/internal/processing/workers" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/state" | 	"github.com/superseriousbusiness/gotosocial/internal/state" | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/timeline" |  | ||||||
| 	"github.com/superseriousbusiness/gotosocial/internal/typeutils" |  | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // Starts workers on the provided state using noop processing functions. | // Starts workers on the provided state using noop processing functions. | ||||||
|  | @ -96,28 +91,6 @@ func StopWorkers(state *state.State) { | ||||||
| 	state.Workers.WebPush.Stop() | 	state.Workers.WebPush.Stop() | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func StartTimelines(state *state.State, visFilter *visibility.Filter, converter *typeutils.Converter) { |  | ||||||
| 	state.Timelines.Home = timeline.NewManager( |  | ||||||
| 		tlprocessor.HomeTimelineGrab(state), |  | ||||||
| 		tlprocessor.HomeTimelineFilter(state, visFilter), |  | ||||||
| 		tlprocessor.HomeTimelineStatusPrepare(state, converter), |  | ||||||
| 		tlprocessor.SkipInsert(), |  | ||||||
| 	) |  | ||||||
| 	if err := state.Timelines.Home.Start(); err != nil { |  | ||||||
| 		panic(fmt.Sprintf("error starting home timeline: %s", err)) |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	state.Timelines.List = timeline.NewManager( |  | ||||||
| 		tlprocessor.ListTimelineGrab(state), |  | ||||||
| 		tlprocessor.ListTimelineFilter(state, visFilter), |  | ||||||
| 		tlprocessor.ListTimelineStatusPrepare(state, converter), |  | ||||||
| 		tlprocessor.SkipInsert(), |  | ||||||
| 	) |  | ||||||
| 	if err := state.Timelines.List.Start(); err != nil { |  | ||||||
| 		panic(fmt.Sprintf("error starting list timeline: %s", err)) |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| // EqualRequestURIs checks whether inputs have equal request URIs, | // EqualRequestURIs checks whether inputs have equal request URIs, | ||||||
| // handling cases of url.URL{}, *url.URL{}, string, *string. | // handling cases of url.URL{}, *url.URL{}, string, *string. | ||||||
| func EqualRequestURIs(u1, u2 any) bool { | func EqualRequestURIs(u1, u2 any) bool { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue