Drop ImageOrLink interface and replace it with Item instead

Changes

4 changed files (+17/-21)

• activitystreams/activity.go
  • @@ -111,10 +111,10 @@ type Activity struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
  • @@ -217,10 +217,10 @@ type IntransitiveActivity struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
  • @@ -428,10 +428,10 @@ type Question struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
• activitystreams/actors.go
  • @@ -95,10 +95,10 @@ type Actor struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
• activitystreams/collections.go
  • @@ -49,10 +49,10 @@ type Collection struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
  • @@ -142,10 +142,10 @@ type OrderedCollection struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
• activitystreams/object.go
  • @@ -98,6 +98,7 @@ type (
    // Item describes an object of any kind. ObjectOrLink interface { ActivityObject + LinkOrURI GetType() ActivityVocabularyType IsLink() bool IsObject() bool
  • @@ -108,11 +109,6 @@ type (
    LinkOrURI interface { GetLink() IRI } - // ImageOrLink is an interface that Image and Link structs implement - ImageOrLink interface { - ObjectOrLink - LinkOrURI - } // MimeType is the type for MIME types MimeType string // LangRef is the type for a language reference, should be ISO 639-1 language specifier.
  • @@ -289,10 +285,10 @@ type Object struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.
  • @@ -430,10 +426,10 @@ type Relationship struct {
    // Indicates an entity that describes an icon for this object. // The image should have an aspect ratio of one (horizontal) to one (vertical) // and should be suitable for presentation at a small size. - Icon ImageOrLink `jsonld:"icon,omitempty"` + Icon Item `jsonld:"icon,omitempty"` // Indicates an entity that describes an image for this object. // Unlike the icon property, there are no aspect ratio or display size limitations assumed. - Image ImageOrLink `jsonld:"image,omitempty"` + Image Item `jsonld:"image,omitempty"` // Indicates one or more entities for which this object is considered a response. InReplyTo Item `jsonld:"inReplyTo,omitempty"` // Indicates one or more physical or logical locations associated with the object.