diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-08-25 15:34:33 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-08-25 15:34:33 +0200 |
| commit | 2dc9fc1626507bb54417fc4a1920b847cafb27a2 (patch) | |
| tree | 4ddeac479b923db38090aac8bd9209f3646851c1 /internal/api/s2s | |
| parent | Manually approves followers (#146) (diff) | |
| download | gotosocial-2dc9fc1626507bb54417fc4a1920b847cafb27a2.tar.xz | |
Pg to bun (#148)
* start moving to bun
* changing more stuff
* more
* and yet more
* tests passing
* seems stable now
* more big changes
* small fix
* little fixes
Diffstat (limited to 'internal/api/s2s')
| -rw-r--r-- | internal/api/s2s/nodeinfo/nodeinfoget.go | 2 | ||||
| -rw-r--r-- | internal/api/s2s/nodeinfo/wellknownget.go | 2 | ||||
| -rw-r--r-- | internal/api/s2s/user/userget_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/internal/api/s2s/nodeinfo/nodeinfoget.go b/internal/api/s2s/nodeinfo/nodeinfoget.go index a54c8b190..c362e1d2e 100644 --- a/internal/api/s2s/nodeinfo/nodeinfoget.go +++ b/internal/api/s2s/nodeinfo/nodeinfoget.go @@ -33,7 +33,7 @@ func (m *Module) NodeInfoGETHandler(c *gin.Context) { "user-agent": c.Request.UserAgent(), }) - ni, err := m.processor.GetNodeInfo(c.Request) + ni, err := m.processor.GetNodeInfo(c.Request.Context(), c.Request) if err != nil { l.Debugf("error with get node info request: %s", err) c.JSON(err.Code(), err.Safe()) diff --git a/internal/api/s2s/nodeinfo/wellknownget.go b/internal/api/s2s/nodeinfo/wellknownget.go index 614d2a9c6..fd2c84408 100644 --- a/internal/api/s2s/nodeinfo/wellknownget.go +++ b/internal/api/s2s/nodeinfo/wellknownget.go @@ -33,7 +33,7 @@ func (m *Module) NodeInfoWellKnownGETHandler(c *gin.Context) { "user-agent": c.Request.UserAgent(), }) - niRel, err := m.processor.GetNodeInfoRel(c.Request) + niRel, err := m.processor.GetNodeInfoRel(c.Request.Context(), c.Request) if err != nil { l.Debugf("error with get node info rel request: %s", err) c.JSON(err.Code(), err.Safe()) diff --git a/internal/api/s2s/user/userget_test.go b/internal/api/s2s/user/userget_test.go index ab0015c57..29cc0e0d8 100644 --- a/internal/api/s2s/user/userget_test.go +++ b/internal/api/s2s/user/userget_test.go @@ -105,7 +105,7 @@ func (suite *UserGetTestSuite) TestGetUser() { // convert person to account // since this account is already known, we should get a pretty full model of it from the conversion - a, err := suite.tc.ASRepresentationToAccount(person, false) + a, err := suite.tc.ASRepresentationToAccount(context.Background(), person, false) assert.NoError(suite.T(), err) assert.EqualValues(suite.T(), targetAccount.Username, a.Username) } |