diff options
Diffstat (limited to 'internal/api/s2s/user')
| -rw-r--r-- | internal/api/s2s/user/inboxpost_test.go | 6 | ||||
| -rw-r--r-- | internal/api/s2s/user/outboxget.go | 78 | ||||
| -rw-r--r-- | internal/api/s2s/user/outboxget_test.go | 2 | ||||
| -rw-r--r-- | internal/api/s2s/user/repliesget.go | 91 | ||||
| -rw-r--r-- | internal/api/s2s/user/repliesget_test.go | 2 | ||||
| -rw-r--r-- | internal/api/s2s/user/user_test.go | 2 | ||||
| -rw-r--r-- | internal/api/s2s/user/userget_test.go | 5 |
7 files changed, 99 insertions, 87 deletions
diff --git a/internal/api/s2s/user/inboxpost_test.go b/internal/api/s2s/user/inboxpost_test.go index 7180fd2f9..90783406f 100644 --- a/internal/api/s2s/user/inboxpost_test.go +++ b/internal/api/s2s/user/inboxpost_test.go @@ -93,6 +93,7 @@ func (suite *InboxPostTestSuite) TestPostBlock() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() @@ -196,6 +197,7 @@ func (suite *InboxPostTestSuite) TestPostUnblock() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() @@ -300,6 +302,7 @@ func (suite *InboxPostTestSuite) TestPostUpdate() { }() userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() @@ -430,8 +433,7 @@ func (suite *InboxPostTestSuite) TestPostDelete() { federator := testrig.NewTestFederator(suite.db, tc, suite.storage, suite.mediaManager, fedWorker) emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) - err = processor.Start() - suite.NoError(err) + suite.NoError(processor.Start()) userModule := user.New(processor).(*user.Module) // setup request diff --git a/internal/api/s2s/user/outboxget.go b/internal/api/s2s/user/outboxget.go index a146cd551..726f86237 100644 --- a/internal/api/s2s/user/outboxget.go +++ b/internal/api/s2s/user/outboxget.go @@ -41,46 +41,50 @@ import ( // // HTTP signature is required on the request. // -// --- -// tags: -// - s2s/federation +// --- +// tags: +// - s2s/federation // -// produces: -// - application/activity+json +// produces: +// - application/activity+json // -// parameters: -// - name: username -// type: string -// description: Username of the account. -// in: path -// required: true -// - name: page -// type: boolean -// description: Return response as a CollectionPage. -// in: query -// default: false -// - name: min_id -// type: string -// description: Minimum ID of the next status, used for paging. -// in: query -// - name: max_id -// type: string -// description: Maximum ID of the next status, used for paging. -// in: query +// parameters: +// - +// name: username +// type: string +// description: Username of the account. +// in: path +// required: true +// - +// name: page +// type: boolean +// description: Return response as a CollectionPage. +// in: query +// default: false +// - +// name: min_id +// type: string +// description: Minimum ID of the next status, used for paging. +// in: query +// - +// name: max_id +// type: string +// description: Maximum ID of the next status, used for paging. +// in: query // -// responses: -// '200': -// in: body -// schema: -// "$ref": "#/definitions/swaggerCollection" -// '400': -// description: bad request -// '401': -// description: unauthorized -// '403': -// description: forbidden -// '404': -// description: not found +// responses: +// '200': +// in: body +// schema: +// "$ref": "#/definitions/swaggerCollection" +// '400': +// description: bad request +// '401': +// description: unauthorized +// '403': +// description: forbidden +// '404': +// description: not found func (m *Module) OutboxGETHandler(c *gin.Context) { // usernames on our instance are always lowercase requestedUsername := strings.ToLower(c.Param(UsernameKey)) diff --git a/internal/api/s2s/user/outboxget_test.go b/internal/api/s2s/user/outboxget_test.go index 24c0e2cee..35a048323 100644 --- a/internal/api/s2s/user/outboxget_test.go +++ b/internal/api/s2s/user/outboxget_test.go @@ -103,6 +103,7 @@ func (suite *OutboxGetTestSuite) TestGetOutboxFirstPage() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() @@ -161,6 +162,7 @@ func (suite *OutboxGetTestSuite) TestGetOutboxNextPage() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() diff --git a/internal/api/s2s/user/repliesget.go b/internal/api/s2s/user/repliesget.go index 86a57e692..b3b20d0c2 100644 --- a/internal/api/s2s/user/repliesget.go +++ b/internal/api/s2s/user/repliesget.go @@ -41,52 +41,57 @@ import ( // // HTTP signature is required on the request. // -// --- -// tags: -// - s2s/federation +// --- +// tags: +// - s2s/federation // -// produces: -// - application/activity+json +// produces: +// - application/activity+json // -// parameters: -// - name: username -// type: string -// description: Username of the account. -// in: path -// required: true -// - name: status -// type: string -// description: ID of the status. -// in: path -// required: true -// - name: page -// type: boolean -// description: Return response as a CollectionPage. -// in: query -// default: false -// - name: only_other_accounts -// type: boolean -// description: Return replies only from accounts other than the status owner. -// in: query -// default: false -// - name: min_id -// type: string -// description: Minimum ID of the next status, used for paging. -// in: query +// parameters: +// - +// name: username +// type: string +// description: Username of the account. +// in: path +// required: true +// - +// name: status +// type: string +// description: ID of the status. +// in: path +// required: true +// - +// name: page +// type: boolean +// description: Return response as a CollectionPage. +// in: query +// default: false +// - +// name: only_other_accounts +// type: boolean +// description: Return replies only from accounts other than the status owner. +// in: query +// default: false +// - +// name: min_id +// type: string +// description: Minimum ID of the next status, used for paging. +// in: query // -// responses: -// '200': -// in: body -// schema: -// "$ref": "#/definitions/swaggerCollection" -// '400': -// description: bad request -// '401': -// description: unauthorized -// '403': -// description: forbidden -// '404': -// description: not found +// responses: +// '200': +// in: body +// schema: +// "$ref": "#/definitions/swaggerCollection" +// '400': +// description: bad request +// '401': +// description: unauthorized +// '403': +// description: forbidden +// '404': +// description: not found func (m *Module) StatusRepliesGETHandler(c *gin.Context) { // usernames on our instance are always lowercase requestedUsername := strings.ToLower(c.Param(UsernameKey)) diff --git a/internal/api/s2s/user/repliesget_test.go b/internal/api/s2s/user/repliesget_test.go index 7ec9ae54c..5ab7f1ebd 100644 --- a/internal/api/s2s/user/repliesget_test.go +++ b/internal/api/s2s/user/repliesget_test.go @@ -112,6 +112,7 @@ func (suite *RepliesGetTestSuite) TestGetRepliesNext() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() @@ -179,6 +180,7 @@ func (suite *RepliesGetTestSuite) TestGetRepliesLast() { emailSender := testrig.NewEmailSender("../../../../web/template/", nil) processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender, suite.mediaManager, clientWorker, fedWorker) userModule := user.New(processor).(*user.Module) + suite.NoError(processor.Start()) // setup request recorder := httptest.NewRecorder() diff --git a/internal/api/s2s/user/user_test.go b/internal/api/s2s/user/user_test.go index 28ca2fa67..2c320d640 100644 --- a/internal/api/s2s/user/user_test.go +++ b/internal/api/s2s/user/user_test.go @@ -93,6 +93,8 @@ func (suite *UserStandardTestSuite) SetupTest() { suite.securityModule = security.New(suite.db, suite.oauthServer).(*security.Module) testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") + + suite.NoError(suite.processor.Start()) } func (suite *UserStandardTestSuite) TearDownTest() { diff --git a/internal/api/s2s/user/userget_test.go b/internal/api/s2s/user/userget_test.go index 9e0fd33ad..c656911d7 100644 --- a/internal/api/s2s/user/userget_test.go +++ b/internal/api/s2s/user/userget_test.go @@ -98,11 +98,6 @@ func (suite *UserGetTestSuite) TestGetUser() { // TestGetUserPublicKeyDeleted checks whether the public key of a deleted account can still be dereferenced. // This is needed by remote instances for authenticating delete requests and stuff like that. func (suite *UserGetTestSuite) TestGetUserPublicKeyDeleted() { - if err := suite.processor.Start(); err != nil { - suite.FailNow(err.Error()) - } - defer suite.processor.Stop() - userModule := user.New(suite.processor).(*user.Module) targetAccount := suite.testAccounts["local_account_1"] |