From 076e26ae0e96cacdb405f7cf59d728603646d03a Mon Sep 17 00:00:00 2001 From: Sebastian Tobie Date: Fri, 11 Nov 2022 22:15:46 +0100 Subject: [PATCH] switched json with jsonld --- go.mod | 1 + go.sum | 2 ++ middleware/wellknown/wellknown.go | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 45d4f66..abf40e1 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( github.com/beevik/etree v1.1.0 // indirect github.com/crewjam/httperr v0.2.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator/v10 v10.11.1 // indirect diff --git a/go.sum b/go.sum index f5546ea..634d3f1 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 h1:GMKIYXyXPGIp+hYiWOhfqK4A023HdgisDT4YGgf99mw= +github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73/go.mod h1:jyveZeGw5LaADntW+UEsMjl3IlIwk+DxlYNsbofQkGA= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= diff --git a/middleware/wellknown/wellknown.go b/middleware/wellknown/wellknown.go index 6ec6acd..b9b294d 100644 --- a/middleware/wellknown/wellknown.go +++ b/middleware/wellknown/wellknown.go @@ -1,10 +1,10 @@ package wellknown import ( - "encoding/json" "net/url" "github.com/gin-gonic/gin" + "github.com/go-ap/jsonld" "github.com/rs/zerolog/log" "go.sebtobie.de/httpserver" "go.sebtobie.de/httpserver/middleware" @@ -120,12 +120,12 @@ func (m *Middleware) webfingerhf(c *gin.Context) { } if outputok { c.Header("Access-Control-Allow-Origin", "*") - json, err := json.Marshal(output) + json, err := jsonld.Marshal(output) if err != nil { c.AbortWithStatus(500) return } - c.Data(200, "application/jrd+json", json) + c.Data(200, jsonld.ContentType, json) } c.AbortWithStatus(404) }