diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-02-02 14:08:13 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-02 14:08:13 +0100 |
| commit | 382512a5a6cc3f13576bbde8d607098d019f4063 (patch) | |
| tree | dc2ccd1d30cd65b3f3d576a8d2a6910bbecc593a /internal/api/wellknown | |
| parent | [chore/performance] use only 1 sqlite db connection regardless of multiplier ... (diff) | |
| download | gotosocial-382512a5a6cc3f13576bbde8d607098d019f4063.tar.xz | |
[feature] Implement `/api/v2/instance` endpoint (#1409)
* interim: start adding /api/v2/instance
* finish up
Diffstat (limited to 'internal/api/wellknown')
| -rw-r--r-- | internal/api/wellknown/nodeinfo/nodeinfoget.go | 4 | ||||
| -rw-r--r-- | internal/api/wellknown/webfinger/webfingerget.go | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/internal/api/wellknown/nodeinfo/nodeinfoget.go b/internal/api/wellknown/nodeinfo/nodeinfoget.go index f54669e1b..8bfab072d 100644 --- a/internal/api/wellknown/nodeinfo/nodeinfoget.go +++ b/internal/api/wellknown/nodeinfo/nodeinfoget.go @@ -46,13 +46,13 @@ import ( // "$ref": "#/definitions/wellKnownResponse" func (m *Module) NodeInfoWellKnownGETHandler(c *gin.Context) { if _, err := apiutil.NegotiateAccept(c, apiutil.JSONAcceptHeaders...); err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) return } resp, errWithCode := m.processor.GetNodeInfoRel(c.Request.Context()) if errWithCode != nil { - apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) return } diff --git a/internal/api/wellknown/webfinger/webfingerget.go b/internal/api/wellknown/webfinger/webfingerget.go index 3fc52f823..8c0d92e23 100644 --- a/internal/api/wellknown/webfinger/webfingerget.go +++ b/internal/api/wellknown/webfinger/webfingerget.go @@ -57,33 +57,33 @@ import ( // "$ref": "#/definitions/wellKnownResponse" func (m *Module) WebfingerGETRequest(c *gin.Context) { if _, err := apiutil.NegotiateAccept(c, apiutil.JSONAcceptHeaders...); err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) return } resourceQuery, set := c.GetQuery("resource") if !set || resourceQuery == "" { err := errors.New("no 'resource' in request query") - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) return } requestedUsername, requestedHost, err := util.ExtractWebfingerParts(resourceQuery) if err != nil { err := fmt.Errorf("bad webfinger request with resource query %s: %w", resourceQuery, err) - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) return } if requestedHost != config.GetHost() && requestedHost != config.GetAccountDomain() { err := fmt.Errorf("requested host %s does not belong to this instance", requestedHost) - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) return } resp, errWithCode := m.processor.GetWebfingerAccount(c.Request.Context(), requestedUsername) if errWithCode != nil { - apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) return } |