diff options
author | 2022-09-28 18:30:40 +0100 | |
---|---|---|
committer | 2022-09-28 18:30:40 +0100 | |
commit | a156188b3eb5cb3da44aa1b7452265f5fa38a607 (patch) | |
tree | 7097fa48d56fbabc7c2c8750b1f3bc9321d71c0f /internal/api/s2s | |
parent | [bugfix] Fix emphasis being added to emoji shortcodes with markdown parsing (... (diff) | |
download | gotosocial-a156188b3eb5cb3da44aa1b7452265f5fa38a607.tar.xz |
[chore] update dependencies, bump to Go 1.19.1 (#826)
* update dependencies, bump Go version to 1.19
* bump test image Go version
* update golangci-lint
* update gotosocial-drone-build
* sign
* linting, go fmt
* update swagger docs
* update swagger docs
* whitespace
* update contributing.md
* fuckin whoopsie doopsie
* linterino, linteroni
* fix followrequest test not starting processor
* fix other api/client tests not starting processor
* fix remaining tests where processor not started
* bump go-runners version
* don't check last-webfingered-at, processor may have updated this
* update swagger command
* update bun to latest version
* fix embed to work the same as before with new bun
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/api/s2s')
-rw-r--r-- | internal/api/s2s/emoji/emojiget_test.go | 2 | ||||
-rw-r--r-- | internal/api/s2s/nodeinfo/nodeinfoget.go | 18 | ||||
-rw-r--r-- | internal/api/s2s/nodeinfo/wellknownget.go | 18 | ||||
-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 | ||||
-rw-r--r-- | internal/api/s2s/webfinger/webfinger_test.go | 2 | ||||
-rw-r--r-- | internal/api/s2s/webfinger/webfingerget.go | 22 |
12 files changed, 133 insertions, 115 deletions
diff --git a/internal/api/s2s/emoji/emojiget_test.go b/internal/api/s2s/emoji/emojiget_test.go index e8c5d1350..959204c7e 100644 --- a/internal/api/s2s/emoji/emojiget_test.go +++ b/internal/api/s2s/emoji/emojiget_test.go @@ -84,6 +84,8 @@ func (suite *EmojiGetTestSuite) 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 *EmojiGetTestSuite) TearDownTest() { diff --git a/internal/api/s2s/nodeinfo/nodeinfoget.go b/internal/api/s2s/nodeinfo/nodeinfoget.go index 8f111bd98..6cb5e1ebf 100644 --- a/internal/api/s2s/nodeinfo/nodeinfoget.go +++ b/internal/api/s2s/nodeinfo/nodeinfoget.go @@ -33,17 +33,17 @@ import ( // // See: https://nodeinfo.diaspora.software/schema.html // -// --- -// tags: -// - nodeinfo +// --- +// tags: +// - nodeinfo // -// produces: -// - application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#" +// produces: +// - application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#" // -// responses: -// '200': -// schema: -// "$ref": "#/definitions/nodeinfo" +// responses: +// '200': +// schema: +// "$ref": "#/definitions/nodeinfo" func (m *Module) NodeInfoGETHandler(c *gin.Context) { if _, err := api.NegotiateAccept(c, api.JSONAcceptHeaders...); err != nil { api.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) diff --git a/internal/api/s2s/nodeinfo/wellknownget.go b/internal/api/s2s/nodeinfo/wellknownget.go index 27e18987f..dc14e43a3 100644 --- a/internal/api/s2s/nodeinfo/wellknownget.go +++ b/internal/api/s2s/nodeinfo/wellknownget.go @@ -33,17 +33,17 @@ import ( // eg. `{"links":[{"rel":"http://nodeinfo.diaspora.software/ns/schema/2.0","href":"http://example.org/nodeinfo/2.0"}]}` // See: https://nodeinfo.diaspora.software/protocol.html // -// --- -// tags: -// - nodeinfo +// --- +// tags: +// - nodeinfo // -// produces: -// - application/json +// produces: +// - application/json // -// responses: -// '200': -// schema: -// "$ref": "#/definitions/wellKnownResponse" +// responses: +// '200': +// schema: +// "$ref": "#/definitions/wellKnownResponse" func (m *Module) NodeInfoWellKnownGETHandler(c *gin.Context) { if _, err := api.NegotiateAccept(c, api.JSONAcceptHeaders...); err != nil { api.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) 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"] diff --git a/internal/api/s2s/webfinger/webfinger_test.go b/internal/api/s2s/webfinger/webfinger_test.go index 19a627a35..d4b721300 100644 --- a/internal/api/s2s/webfinger/webfinger_test.go +++ b/internal/api/s2s/webfinger/webfinger_test.go @@ -96,6 +96,8 @@ func (suite *WebfingerStandardTestSuite) 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 *WebfingerStandardTestSuite) TearDownTest() { diff --git a/internal/api/s2s/webfinger/webfingerget.go b/internal/api/s2s/webfinger/webfingerget.go index 68ea760bd..9949140c1 100644 --- a/internal/api/s2s/webfinger/webfingerget.go +++ b/internal/api/s2s/webfinger/webfingerget.go @@ -39,22 +39,24 @@ import ( // For example, a GET to `https://goblin.technology/.well-known/webfinger?resource=acct:tobi@goblin.technology` would return: // // ``` -// {"subject":"acct:tobi@goblin.technology","aliases":["https://goblin.technology/users/tobi","https://goblin.technology/@tobi"],"links":[{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://goblin.technology/@tobi"},{"rel":"self","type":"application/activity+json","href":"https://goblin.technology/users/tobi"}]} +// +// {"subject":"acct:tobi@goblin.technology","aliases":["https://goblin.technology/users/tobi","https://goblin.technology/@tobi"],"links":[{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://goblin.technology/@tobi"},{"rel":"self","type":"application/activity+json","href":"https://goblin.technology/users/tobi"}]} +// // ``` // // See: https://webfinger.net/ // -// --- -// tags: -// - webfinger +// --- +// tags: +// - webfinger // -// produces: -// - application/json +// produces: +// - application/json // -// responses: -// '200': -// schema: -// "$ref": "#/definitions/wellKnownResponse" +// responses: +// '200': +// schema: +// "$ref": "#/definitions/wellKnownResponse" func (m *Module) WebfingerGETRequest(c *gin.Context) { l := log.WithFields(kv.Fields{ {K: "user-agent", V: c.Request.UserAgent()}, |