Simplifying the object IDs

Changes

2 changed files (+4/-24)

• iri.go
  • @@ -49,6 +49,9 @@ func (i *IRI) UnmarshalJSON(s []byte) error {
    // MarshalJSON func (i IRI) MarshalJSON() ([]byte, error) { + if i == "" { + return nil, nil + } b := make([]byte, 0) write(&b, '"') writeS(&b, i.String())
• object_id.go
  • @@ -1,10 +1,5 @@
    package activitypub - import ( - "bytes" - "strings" - ) - // ID designates an unique global identifier. // All Objects in [ActivityStreams] should have unique global identifiers. // ActivityPub extends this requirement; all objects distributed by the ActivityPub protocol MUST
  • @@ -17,25 +12,7 @@ import (
    // to that of their originating server. (Publicly facing content SHOULD use HTTPS URIs). // 2. An ID explicitly specified as the JSON null object, which implies an anonymous object // (a part of its parent context) - type ID IRI - - // UnmarshalJSON - func (i *ID) UnmarshalJSON(data []byte) error { - *i = ID(strings.Trim(string(data), "\"")) - return nil - } - - // MarshalJSON - func (i ID) MarshalJSON() ([]byte, error) { - if len(i) == 0 { - return nil, nil - } - b := bytes.Buffer{} - b.Write([]byte{'"'}) - b.WriteString(string(i)) - b.Write([]byte{'"'}) - return b.Bytes(), nil - } + type ID = IRI func (i *ID) IsValid() bool { return i != nil && len(*i) > 0