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

Add nil checks for OnX helper functions

Browse source
This commit is contained in:
Marius Orcsik 2021-09-12 12:52:27 +02:00
parent d347363314
commit df7d3cbe81
No known key found for this signature in database
GPG key ID: DBF5E47F5DBC4D21
5 changed files with 64 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
helpers.go
View file

@ -19,6 +19,9 @@ type WithItemCollectionFn func(*ItemCollection) error
// OnLink
func OnLink(it Item, fn WithLinkFn) error {
if it == nil {
return nil
}
ob, err := ToLink(it)
if err != nil {
return err
@ -28,6 +31,9 @@ func OnLink(it Item, fn WithLinkFn) error {
// OnObject
func OnObject(it Item, fn WithObjectFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -47,6 +53,9 @@ func OnObject(it Item, fn WithObjectFn) error {
// OnActivity
func OnActivity(it Item, fn WithActivityFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -66,6 +75,9 @@ func OnActivity(it Item, fn WithActivityFn) error {
// OnIntransitiveActivity
func OnIntransitiveActivity(it Item, fn WithIntransitiveActivityFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -85,6 +97,9 @@ func OnIntransitiveActivity(it Item, fn WithIntransitiveActivityFn) error {
// OnQuestion
func OnQuestion(it Item, fn WithQuestionFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -104,6 +119,9 @@ func OnQuestion(it Item, fn WithQuestionFn) error {
// OnActor
func OnActor(it Item, fn WithActorFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -120,8 +138,12 @@ func OnActor(it Item, fn WithActorFn) error {
}
return fn(act)
}
// OnCollection
func OnCollection (it Item, fn WithCollectionFn) error {
func OnCollection(it Item, fn WithCollectionFn) error {
if it == nil {
return nil
}
col, err := ToCollection(it)
if err != nil {
return err
@ -131,6 +153,9 @@ func OnCollection (it Item, fn WithCollectionFn) error {
// OnCollectionIntf
func OnCollectionIntf(it Item, fn WithCollectionInterfaceFn) error {
if it == nil {
return nil
}
switch it.GetType() {
case CollectionOfItems:
col, err := ToItemCollection(it)
@ -173,6 +198,9 @@ func OnCollectionIntf(it Item, fn WithCollectionInterfaceFn) error {
// OnCollectionPage
func OnCollectionPage(it Item, fn WithCollectionPageFn) error {
if it == nil {
return nil
}
col, err := ToCollectionPage(it)
if err != nil {
return err
@ -182,6 +210,9 @@ func OnCollectionPage(it Item, fn WithCollectionPageFn) error {
// OnOrderedCollection
func OnOrderedCollection(it Item, fn WithOrderedCollectionFn) error {
if it == nil {
return nil
}
col, err := ToOrderedCollection(it)
if err != nil {
return err
@ -191,6 +222,9 @@ func OnOrderedCollection(it Item, fn WithOrderedCollectionFn) error {
// OnOrderedCollectionPage executes a function on an ordered collection page type item
func OnOrderedCollectionPage(it Item, fn WithOrderedCollectionPageFn) error {
if it == nil {
return nil
}
col, err := ToOrderedCollectionPage(it)
if err != nil {
return err
@ -200,6 +234,9 @@ func OnOrderedCollectionPage(it Item, fn WithOrderedCollectionPageFn) error {
// OnItemCollection executes a function on a collection type item
func OnItemCollection(it Item, fn WithItemCollectionFn) error {
if it == nil {
return nil
}
col, err := ToItemCollection(it)
if err != nil {
return err
@ -226,7 +263,7 @@ func ItemOrderTimestamp(i1, i2 Item) bool {
return t1.Sub(t2) > 0
}
func notEmptyLink (l *Link) bool {
func notEmptyLink(l *Link) bool {
return len(l.ID) > 0 ||
LinkTypes.Contains(l.Type) ||
len(l.MediaType) > 0 ||
@ -278,7 +315,7 @@ func notEmptyObject(o *Object) bool {
o.URL != nil
}
func notEmptyInstransitiveActivity (i *IntransitiveActivity) bool {
func notEmptyInstransitiveActivity(i *IntransitiveActivity) bool {
notEmpty := i.Actor != nil ||
i.Target != nil ||
i.Result != nil ||
@ -320,7 +357,7 @@ func notEmptyActor(a *Actor) bool {
a.Streams != nil ||
len(a.PublicKey.ID) > 0 ||
(a.PublicKey.Owner != nil &&
len(a.PublicKey.PublicKeyPem) > 0)
len(a.PublicKey.PublicKeyPem) > 0)
}
// NotEmpty
@ -329,7 +366,7 @@ func NotEmpty(i Item) bool {
return false
}
var notEmpty bool
if IsIRI(i) {
if IsIRI(i) {
notEmpty = len(i.GetLink()) > 0
}
if i.IsCollection() {

7
place.go
View file

@ -258,9 +258,12 @@ func ToPlace(it Item) (*Place, error) {
return nil, fmt.Errorf("unable to convert %q", it.GetType())
}
type withPlaceFn func (*Place) error
type withPlaceFn func(*Place) error
func OnPlace(it Item, fn withPlaceFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -271,7 +274,7 @@ func OnPlace(it Item, fn withPlaceFn) error {
return nil
})
}
ob, err := ToPlace(it)
ob, err := ToPlace(it)
if err != nil {
return err
}

9
profile.go
View file

@ -198,7 +198,7 @@ func (p *Profile) Recipients() ItemCollection {
}
// Clean removes Bto and BCC properties
func (p *Profile) Clean(){
func (p *Profile) Clean() {
p.BCC = nil
p.Bto = nil
}
@ -226,9 +226,12 @@ func ToProfile(it Item) (*Profile, error) {
return nil, fmt.Errorf("unable to convert %q", it.GetType())
}
type withProfileFn func (*Profile) error
type withProfileFn func(*Profile) error
func OnProfile(it Item, fn withProfileFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -239,7 +242,7 @@ func OnProfile(it Item, fn withProfileFn) error {
return nil
})
}
ob, err := ToProfile(it)
ob, err := ToProfile(it)
if err != nil {
return err
}

7
relationship.go
View file

@ -241,10 +241,13 @@ func ToRelationship(it Item) (*Relationship, error) {
return nil, fmt.Errorf("unable to convert %q", it.GetType())
}
type withRelationshipFn func (*Relationship) error
type withRelationshipFn func(*Relationship) error
func OnRelationship(it Item, fn withRelationshipFn) error {
ob, err := ToRelationship(it)
if it == nil {
return nil
}
ob, err := ToRelationship(it)
if err != nil {
return err
}

10
tombstone.go
View file

@ -204,12 +204,11 @@ func (t *Tombstone) Recipients() ItemCollection {
}
// Clean removes Bto and BCC properties
func (t *Tombstone) Clean(){
func (t *Tombstone) Clean() {
t.BCC = nil
t.Bto = nil
}
// ToTombstone
func ToTombstone(it Item) (*Tombstone, error) {
switch i := it.(type) {
@ -233,9 +232,12 @@ func ToTombstone(it Item) (*Tombstone, error) {
return nil, fmt.Errorf("unable to convert %q", it.GetType())
}
type withTombstoneFn func (*Tombstone) error
type withTombstoneFn func(*Tombstone) error
func OnTombstone(it Item, fn withTombstoneFn) error {
if it == nil {
return nil
}
if IsItemCollection(it) {
return OnItemCollection(it, func(col *ItemCollection) error {
for _, it := range *col {
@ -246,7 +248,7 @@ func OnTombstone(it Item, fn withTombstoneFn) error {
return nil
})
}
ob, err := ToTombstone(it)
ob, err := ToTombstone(it)
if err != nil {
return err
}