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/web/profile.go | |
| 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/web/profile.go')
| -rw-r--r-- | internal/web/profile.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/web/profile.go b/internal/web/profile.go index ce7335c02..482e5caa7 100644 --- a/internal/web/profile.go +++ b/internal/web/profile.go @@ -45,25 +45,24 @@ func (m *Module) profileGETHandler(c *gin.Context) { authed, err := oauth.Authed(c, false, false, false, false) if err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) return } username := strings.ToLower(c.Param(usernameKey)) if username == "" { err := errors.New("no account username specified") - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) return } - host := config.GetHost() - instance, err := m.processor.InstanceGet(ctx, host) + instance, err := m.processor.InstanceGetV1(ctx) if err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) + apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) return } - instanceGet := func(ctx context.Context, domain string) (*apimodel.Instance, gtserror.WithCode) { + instanceGet := func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode) { return instance, nil } @@ -145,14 +144,14 @@ func (m *Module) returnAPProfile(ctx context.Context, c *gin.Context, username s user, errWithCode := m.processor.GetFediUser(ctx, username, c.Request.URL) if errWithCode != nil { - apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGet) //nolint:contextcheck + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) //nolint:contextcheck return } b, mErr := json.Marshal(user) if mErr != nil { err := fmt.Errorf("could not marshal json: %s", mErr) - apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet) //nolint:contextcheck + apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) //nolint:contextcheck return } |