Add an Collection() method to return the underlying type

Changes

4 changed files (+61/-14)

• activitypub/collections.go
  • @@ -11,6 +11,7 @@ type Page ObjectOrLink
    type CollectionInterface interface { ObjectOrLink + Collection() CollectionInterface Append(ob ObjectOrLink) error }
  • @@ -370,3 +371,13 @@ func (o *OrderedCollection) MarshalJSON() ([]byte, error) {
    return nil, nil } */ + + // Collection returns the underlying Collection type + func (c *Collection) Collection() CollectionInterface { + return c + } + + // Collection returns the underlying Collection type + func (o *OrderedCollection) Collection() CollectionInterface { + return o + }
• activitypub/inbox.go
  • @@ -46,42 +46,42 @@ func (i *Inbox) Append(ob ObjectOrLink) error {
    } // GetID returns the ObjectID corresponding to InboxStream - func (i InboxStream) GetID() *ObjectID { - return OrderedCollection(i).GetID() + func (i *InboxStream) GetID() *ObjectID { + return i.Collection().GetID() } // GetType returns the InboxStream's type - func (i InboxStream) GetType() ActivityVocabularyType { + func (i *InboxStream) GetType() ActivityVocabularyType { return i.Type } // IsLink returns false for an InboxStream object - func (i InboxStream) IsLink() bool { + func (i *InboxStream) IsLink() bool { return false } // IsObject returns true for a InboxStream object - func (i InboxStream) IsObject() bool { + func (i *InboxStream) IsObject() bool { return true } // GetID returns the ObjectID corresponding to Inbox - func (i Inbox) GetID() *ObjectID { - return OrderedCollection(i).GetID() + func (i *Inbox) GetID() *ObjectID { + return i.Collection().GetID() } // GetType returns the Inbox's type - func (i Inbox) GetType() ActivityVocabularyType { + func (i *Inbox) GetType() ActivityVocabularyType { return i.Type } // IsLink returns false for an Inbox object - func (i Inbox) IsLink() bool { + func (i *Inbox) IsLink() bool { return false } // IsObject returns true for a Inbox object - func (i Inbox) IsObject() bool { + func (i *Inbox) IsObject() bool { return true }
  • @@ -104,3 +104,15 @@ func (i *Inbox) UnmarshalJSON(data []byte) error {
    return err } + + // Collection returns the underlying Collection type + func (i *Inbox) Collection() CollectionInterface { + c := OrderedCollection(*i) + return &c + } + + // Collection returns the underlying Collection type + func (i *InboxStream) Collection() CollectionInterface { + c := OrderedCollection(*i) + return &c + }
• activitypub/liked.go
  • @@ -41,7 +41,7 @@ func (l *Liked) Append(ob ObjectOrLink) error {
    // GetID returns the ObjectID corresponding to the LikedCollection func (l LikedCollection) GetID() *ObjectID { - return OrderedCollection(l).GetID() + return l.Collection().GetID() } // GetType returns the LikedCollection's type
  • @@ -61,7 +61,7 @@ func (l LikedCollection) IsObject() bool {
    // GetID returns the ObjectID corresponding to the Liked func (l Liked) GetID() *ObjectID { - return OrderedCollection(l).GetID() + return l.Collection().GetID() } // GetType returns the Liked's type
  • @@ -78,3 +78,15 @@ func (l Liked) IsLink() bool {
    func (l Liked) IsObject() bool { return true } + + // Collection returns the underlying Collection type + func (l *Liked) Collection() CollectionInterface { + c := OrderedCollection(*l) + return &c + } + + // Collection returns the underlying Collection type + func (l *LikedCollection) Collection() CollectionInterface { + c := OrderedCollection(*l) + return &c + }
• activitypub/outbox.go
  • @@ -40,7 +40,7 @@ func (o *Outbox) Append(ob ObjectOrLink) error {
    // GetID returns the ObjectID corresponding to the OutboxStream func (o OutboxStream) GetID() *ObjectID { - return OrderedCollection(o).GetID() + return o.Collection().GetID() } // GetType returns the OutboxStream's type
  • @@ -60,7 +60,7 @@ func (o OutboxStream) IsObject() bool {
    // GetID returns the ObjectID corresponding to Outbox func (o Outbox) GetID() *ObjectID { - return OrderedCollection(o).GetID() + return o.Collection().GetID() } // GetType returns the Outbox's type
  • @@ -97,3 +97,15 @@ func (o *Outbox) UnmarshalJSON(data []byte) error {
    return err } + + // Collection returns the underlying Collection type + func (o *Outbox) Collection() CollectionInterface { + c := OrderedCollection(*o) + return &c + } + + // Collection returns the underlying Collection type + func (o *OutboxStream) Collection() CollectionInterface { + c := OrderedCollection(*o) + return &c + }