Removed flatten functionality from here

Changes

4 changed files (+0/-66)

• activity.go
  • @@ -746,18 +746,6 @@ func ToActivity(it Item) (*Activity, error) {
    return nil, errors.New("unable to convert activity") } - // FlattenActivityProperties flattens the Activity's properties from Object type to IRI - func FlattenActivityProperties(act *Activity) *Activity { - act.Object = Flatten(act.Object) - act.Actor = Flatten(act.Actor) - act.Target = Flatten(act.Target) - act.Result = Flatten(act.Result) - act.Origin = Flatten(act.Origin) - act.Result = Flatten(act.Result) - act.Instrument = Flatten(act.Instrument) - return act - } - // MarshalJSON func (a Activity) MarshalJSON() ([]byte, error) { b := make([]byte, 0)
• intransitive_activity.go
  • @@ -231,17 +231,6 @@ func ToIntransitiveActivity(it Item) (*IntransitiveActivity, error) {
    return nil, errors.New("unable to convert to intransitive activity") } - // FlattenIntransitiveActivityProperties flattens the IntransitiveActivity's properties from Object type to IRI - func FlattenIntransitiveActivityProperties(act *IntransitiveActivity) *IntransitiveActivity { - act.Actor = Flatten(act.Actor) - act.Target = Flatten(act.Target) - act.Result = Flatten(act.Result) - act.Origin = Flatten(act.Origin) - act.Result = Flatten(act.Result) - act.Instrument = Flatten(act.Instrument) - return act - } - // ArriveNew initializes an Arrive activity func ArriveNew(id ID) *Arrive { a := IntransitiveActivityNew(id, ArriveType)
• item.go
  • @@ -11,19 +11,6 @@ const (
    NilID = NilIRI ) - // Flatten checks if Item can be flatten to an IRI or array of IRIs and returns it if so - func Flatten(it Item) Item { - if it.IsCollection() { - if c, ok := it.(CollectionInterface); ok { - it = FlattenItemCollection(c.Collection()) - } - } - if it != nil && len(it.GetLink()) > 0 { - return it.GetLink() - } - return it - } - // ItemsEqual checks if it and with Items are equal func ItemsEqual(it, with Item) bool { if it == nil || with == nil{
• object.go
  • @@ -390,36 +390,6 @@ func ToObject(it Item) (*Object, error) {
    return nil, fmt.Errorf("unable to convert %q", it.GetType()) } - // FlattenObjectProperties flattens the Object's properties from Object types to IRI - func FlattenObjectProperties(o *Object) *Object { - o.Replies = Flatten(o.Replies) - o.AttributedTo = Flatten(o.AttributedTo) - o.To = FlattenItemCollection(o.To) - o.Bto = FlattenItemCollection(o.Bto) - o.CC = FlattenItemCollection(o.CC) - o.BCC = FlattenItemCollection(o.BCC) - o.Audience = FlattenItemCollection(o.Audience) - o.Tag = FlattenItemCollection(o.Tag) - return o - } - - // FlattenProperties flattens the Item's properties from Object types to IRI - func FlattenProperties(it Item) Item { - if ActivityTypes.Contains(it.GetType()) { - act, err := ToActivity(it) - if err == nil { - return FlattenActivityProperties(act) - } - } - if ActorTypes.Contains(it.GetType()) || ObjectTypes.Contains(it.GetType()) { - ob, err := ToObject(it) - if err == nil { - return FlattenObjectProperties(ob) - } - } - return it - } - // Source is intended to convey some sort of source from which the content markup was derived, // as a form of provenance, or to support future editing by clients. type Source struct {