mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-18 13:07:35 -06:00
Merge branch 'main' into focal_point
This commit is contained in:
commit
c7fc66abae
108 changed files with 2935 additions and 5213 deletions
|
|
@ -509,7 +509,9 @@ func (c *Converter) ASFollowToFollow(ctx context.Context, followable ap.Followab
|
|||
|
||||
follow := >smodel.Follow{
|
||||
URI: uri,
|
||||
Account: origin,
|
||||
AccountID: origin.ID,
|
||||
TargetAccount: target,
|
||||
TargetAccountID: target.ID,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import (
|
|||
"github.com/stretchr/testify/suite"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/admin"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/filter/visibility"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/processing"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/state"
|
||||
|
|
@ -529,12 +528,6 @@ func (suite *TypeUtilsTestSuite) TearDownTest() {
|
|||
// GetProcessor is a utility function that instantiates a processor.
|
||||
// Useful when a test in the test suite needs to change some state.
|
||||
func (suite *TypeUtilsTestSuite) GetProcessor() *processing.Processor {
|
||||
testrig.StartTimelines(
|
||||
&suite.state,
|
||||
visibility.NewFilter(&suite.state),
|
||||
suite.typeconverter,
|
||||
)
|
||||
|
||||
httpClient := testrig.NewMockHTTPClient(nil, "../../testrig/media")
|
||||
transportController := testrig.NewTestTransportController(&suite.state, httpClient)
|
||||
mediaManager := testrig.NewTestMediaManager(&suite.state)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue