diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-06-08 20:38:03 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-06-08 20:38:03 +0200 |
| commit | 1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643 (patch) | |
| tree | 727436fb9bf9da25e30c5ded65c5b5ccaffe0cf0 /internal/transport/derefinstance.go | |
| parent | [bugfix] #621: add weak type handing to mapstructure decode (#625) (diff) | |
| download | gotosocial-1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643.tar.xz | |
[feature] More consistent API error handling (#637)
* update templates
* start reworking api error handling
* update template
* return AP status at web endpoint if negotiated
* start making api error handling much more consistent
* update account endpoints to new error handling
* use new api error handling in admin endpoints
* go fmt ./...
* use api error logic in app
* use generic error handling in auth
* don't export generic error handler
* don't defer clearing session
* user nicer error handling on oidc callback handler
* tidy up the sign in handler
* tidy up the token handler
* use nicer error handling in blocksget
* auth emojis endpoint
* fix up remaining api endpoints
* fix whoopsie during login flow
* regenerate swagger docs
* change http error logging to debug
Diffstat (limited to 'internal/transport/derefinstance.go')
| -rw-r--r-- | internal/transport/derefinstance.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go index 1acbcc364..b99d28a23 100644 --- a/internal/transport/derefinstance.go +++ b/internal/transport/derefinstance.go @@ -30,6 +30,7 @@ import ( "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/api" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" @@ -94,7 +95,7 @@ func dereferenceByAPIV1Instance(ctx context.Context, t *transport, iri *url.URL) return nil, err } - req.Header.Add("Accept", "application/json") + req.Header.Add("Accept", string(api.AppJSON)) req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", cleanIRI.Host) @@ -245,7 +246,7 @@ func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*ur if err != nil { return nil, err } - req.Header.Add("Accept", "application/json") + req.Header.Add("Accept", string(api.AppJSON)) req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", cleanIRI.Host) @@ -297,7 +298,7 @@ func callNodeInfo(ctx context.Context, t *transport, iri *url.URL) (*apimodel.No if err != nil { return nil, err } - req.Header.Add("Accept", "application/json") + req.Header.Add("Accept", string(api.AppJSON)) req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", iri.Host) |