a/activitypub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed flatten functionality from here

Browse source
This commit is contained in:
mariusor 2021-01-13 10:52:50 +01:00
parent cc0968f78b
commit 247f1fbf22
4 changed files with 0 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
activity.go
View file

@ -746,18 +746,6 @@ func ToActivity(it Item) (*Activity, error) {
return nil, errors.New("unable to convert activity") 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 // MarshalJSON
func (a Activity) MarshalJSON() ([]byte, error) { func (a Activity) MarshalJSON() ([]byte, error) {
b := make([]byte, 0) b := make([]byte, 0)

11
intransitive_activity.go
View file

@ -231,17 +231,6 @@ func ToIntransitiveActivity(it Item) (*IntransitiveActivity, error) {
return nil, errors.New("unable to convert to intransitive activity") 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 // ArriveNew initializes an Arrive activity
func ArriveNew(id ID) *Arrive { func ArriveNew(id ID) *Arrive {
a := IntransitiveActivityNew(id, ArriveType) a := IntransitiveActivityNew(id, ArriveType)

13
item.go
View file

@ -11,19 +11,6 @@ const (
NilID = NilIRI 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 // ItemsEqual checks if it and with Items are equal
func ItemsEqual(it, with Item) bool { func ItemsEqual(it, with Item) bool {
if it == nil || with == nil{ if it == nil || with == nil{

30
object.go
View file

@ -390,36 +390,6 @@ func ToObject(it Item) (*Object, error) {
return nil, fmt.Errorf("unable to convert %q", it.GetType()) 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, // 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. // as a form of provenance, or to support future editing by clients.
type Source struct { type Source struct {