Fixed an actor's public key property Json encode and decode

Changes

1 changed files (+11/-2)

• actor.go
  • @@ -1,11 +1,13 @@
    package activitypub import ( + "encoding/json" "fmt" - "github.com/buger/jsonparser" "reflect" "time" "unsafe" + + "github.com/buger/jsonparser" ) // CanReceiveActivities Types
  • @@ -222,7 +224,9 @@ func (p PublicKey) MarshalJSON() ([]byte, error) {
    notEmpty = writeIRIJSONProp(&b, "owner", p.Owner) || notEmpty } if len(p.PublicKeyPem) > 0 { - notEmpty = writeIRIJSONProp(&b, "publicKeyPem", p.Owner) || notEmpty + if pem, err := json.Marshal(p.PublicKeyPem); err == nil { + notEmpty = writeJSONProp(&b, "publicKeyPem", pem) || notEmpty + } } if notEmpty {
  • @@ -379,6 +383,11 @@ func (a Actor) MarshalJSON() ([]byte, error) {
    } notEmpty = lNotEmpty || notEmpty } + if len(a.PublicKey.PublicKeyPem)+len(a.PublicKey.ID) > 0 { + if v, err := a.PublicKey.MarshalJSON(); err == nil && len(v) > 0 { + notEmpty = writeJSONProp(&b, "publicKey", v) || notEmpty + } + } if notEmpty { write(&b, '}')