diff options
Diffstat (limited to 'internal/transport')
-rw-r--r-- | internal/transport/deliver.go | 3 | ||||
-rw-r--r-- | internal/transport/dereference.go | 4 | ||||
-rw-r--r-- | internal/transport/derefinstance.go | 7 | ||||
-rw-r--r-- | internal/transport/finger.go | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/internal/transport/deliver.go b/internal/transport/deliver.go index 0405116ad..16ebbd4b6 100644 --- a/internal/transport/deliver.go +++ b/internal/transport/deliver.go @@ -27,6 +27,7 @@ import ( "strings" "sync" + "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/config" ) @@ -79,7 +80,7 @@ func (t *transport) Deliver(ctx context.Context, b []byte, to *url.URL) error { return err } - req.Header.Add("Content-Type", "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"") + req.Header.Add("Content-Type", string(api.AppActivityLDJSON)) req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", to.Host) diff --git a/internal/transport/dereference.go b/internal/transport/dereference.go index ba48488d7..cb1220d13 100644 --- a/internal/transport/dereference.go +++ b/internal/transport/dereference.go @@ -25,6 +25,7 @@ import ( "net/http" "net/url" + "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/uris" ) @@ -52,7 +53,8 @@ func (t *transport) Dereference(ctx context.Context, iri *url.URL) ([]byte, erro if err != nil { return nil, err } - req.Header.Add("Accept", "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\",application/activity+json") + + req.Header.Add("Accept", string(api.AppActivityLDJSON)+","+string(api.AppActivityJSON)) req.Header.Add("Accept-Charset", "utf-8") req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", iri.Host) 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) diff --git a/internal/transport/finger.go b/internal/transport/finger.go index 7554a242f..2ea34ad81 100644 --- a/internal/transport/finger.go +++ b/internal/transport/finger.go @@ -23,6 +23,8 @@ import ( "fmt" "io/ioutil" "net/http" + + "github.com/superseriousbusiness/gotosocial/internal/api" ) func (t *transport) Finger(ctx context.Context, targetUsername string, targetDomain string) ([]byte, error) { @@ -37,7 +39,7 @@ func (t *transport) Finger(ctx context.Context, targetUsername string, targetDom if err != nil { return nil, err } - req.Header.Add("Accept", "application/json") + req.Header.Add("Accept", string(api.AppJSON)) req.Header.Add("Accept", "application/jrd+json") req.Header.Add("User-Agent", t.controller.userAgent) req.Header.Set("Host", req.URL.Host) |