a/gitea
Archived
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use go-ap/jsonld to add @context and marshal JSON

Browse source
This commit is contained in:
Anthony Wang 2022-06-18 12:27:11 -05:00
parent fe18cf7620
commit 37d2d01f8f
Signed by: a
GPG key ID: BC96B00AEC5F2D76
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
routers/api/v1/activitypub/person.go
View file

@ -10,11 +10,11 @@ import (
"code.gitea.io/gitea/modules/activitypub"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
ap "github.com/go-ap/activitypub"
"github.com/go-ap/jsonld"
)
// Person function returns the Person actor for a user
@ -72,28 +72,13 @@ func Person(ctx *context.APIContext) {
}
person.PublicKey.PublicKeyPem = publicKeyPem
binary, err := person.MarshalJSON()
binary, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI), jsonld.IRI(ap.SecurityContextURI)).Marshal(person)
if err != nil {
ctx.Error(http.StatusInternalServerError, "Serialize", err)
ctx.Error(http.StatusInternalServerError, "MarshalJSON", err)
return
}
var jsonmap map[string]interface{}
err = json.Unmarshal(binary, &jsonmap)
if err != nil {
ctx.Error(http.StatusInternalServerError, "Unmarshal", err)
return
}
jsonmap["@context"] = []string{"https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"}
ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
ctx.Resp.WriteHeader(http.StatusOK)
binary, err = json.Marshal(jsonmap)
if err != nil {
ctx.Error(http.StatusInternalServerError, "Marshal", err)
return
}
if _, err = ctx.Resp.Write(binary); err != nil {
log.Error("write to resp err: %v", err)
}