Golang
/
httpserver
1
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

switched json with jsonld

Dieser Commit ist enthalten in:
Sebastian Tobie 2022-11-11 22:15:46 +01:00
Ursprung 2129c6339c
Commit 076e26ae0e
3 geänderte Dateien mit 6 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
go.mod
Datei anzeigen

@ -25,6 +25,7 @@ require (
github.com/beevik/etree v1.1.0 // indirect github.com/beevik/etree v1.1.0 // indirect
github.com/crewjam/httperr v0.2.0 // indirect github.com/crewjam/httperr v0.2.0 // indirect
github.com/gin-contrib/sse v0.1.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/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect github.com/go-playground/validator/v10 v10.11.1 // indirect

2
go.sum
Datei anzeigen

@ -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-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 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= 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 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= 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= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=

6
middleware/wellknown/wellknown.go
Datei anzeigen

@ -1,10 +1,10 @@
package wellknown package wellknown
import ( import (
"encoding/json"
"net/url" "net/url"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-ap/jsonld"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"go.sebtobie.de/httpserver" "go.sebtobie.de/httpserver"
"go.sebtobie.de/httpserver/middleware" "go.sebtobie.de/httpserver/middleware"
@ -120,12 +120,12 @@ func (m *Middleware) webfingerhf(c *gin.Context) {
} }
if outputok { if outputok {
c.Header("Access-Control-Allow-Origin", "*") c.Header("Access-Control-Allow-Origin", "*")
json, err := json.Marshal(output) json, err := jsonld.Marshal(output)
if err != nil { if err != nil {
c.AbortWithStatus(500) c.AbortWithStatus(500)
return return
} }
c.Data(200, "application/jrd+json", json) c.Data(200, jsonld.ContentType, json)
} }
c.AbortWithStatus(404) c.AbortWithStatus(404)
} }