We didn't want collections, but Object arrays

Changes

4 changed files (+9/-23)

• activitypub/activity.go
  • @@ -122,7 +122,7 @@ type Activity struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
  • @@ -228,7 +228,7 @@ type IntransitiveActivity struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
  • @@ -439,7 +439,7 @@ type Question struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
• activitypub/actors.go
  • @@ -104,7 +104,7 @@ type Actor struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
  • @@ -391,13 +391,7 @@ func (a *Actor) UnmarshalJSON(data []byte) error {
    o.UnmarshalJSON(v) a.Outbox = &o - r := Collection{} - v1, _, _, err := jsonparser.Get(data, "replies") - if err != nil { - fmt.Print(err) - } - r.UnmarshalJSON(v1) - r.Replies = &r + o.Replies = getAPObjectsArr(data, "replies") return nil }
• activitypub/collections.go
  • @@ -64,7 +64,7 @@ type Collection struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
  • @@ -151,7 +151,7 @@ type OrderedCollection struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
• activitypub/object.go
  • @@ -6,8 +6,6 @@ import (
    "sort" "strings" "time" - - "github.com/buger/jsonparser" ) // ObjectID designates an unique global identifier.
  • @@ -281,7 +279,7 @@ type Object struct {
    // The date and time at which the object was published Published time.Time `jsonld:"published,omitempty"` // Identifies a Collection containing objects considered to be responses to this object. - Replies CollectionInterface `jsonld:"replies,omitempty"` + Replies ObjectsArr `jsonld:"replies,omitempty"` // The date and time describing the actual or expected starting time of the object. // When used with an Activity object, for instance, the startTime property specifies // the moment the activity began or is scheduled to begin.
  • @@ -443,13 +441,7 @@ func (o *Object) UnmarshalJSON(data []byte) error {
    //} //fmt.Printf("%s\n %#v", data, o) - r := Collection{} - v1, _, _, err := jsonparser.Get(data, "replies") - if err != nil { - fmt.Print(err) - } - r.UnmarshalJSON(v1) - r.Replies = &r + o.Replies = getAPObjectsArr(data, "replies") return nil }