Added ToObject/OnObject pairs for local Object

Changes

2 changed files (+20/-4)

• helpers.go
  • @@ -6,7 +6,7 @@ import (
    "github.com/go-ap/activitystreams" ) - type withObjectFn func (*activitystreams.Object) error + type withObjectFn func (*Object) error type withActivityFn func (*activitystreams.Activity) error type withIntransitiveActivityFn func (*activitystreams.IntransitiveActivity) error type withQuestionFn func (*activitystreams.Question) error
  • @@ -20,7 +20,7 @@ type withOrderedCollectionPageFn func (*activitystreams.OrderedCollectionPage) e
    func OnObject(it activitystreams.Item, fn withObjectFn) error { if activitystreams.ActivityTypes.Contains(it.GetType()) { return OnActivity(it, func(a *activitystreams.Activity) error { - ob, err := activitystreams.ToObject(&a.Parent) + ob, err := ToObject(&a.Parent) if err != nil { return err }
  • @@ -28,14 +28,14 @@ func OnObject(it activitystreams.Item, fn withObjectFn) error {
    }) } else if activitystreams.ActorTypes.Contains(it.GetType()) { return OnPerson(it, func(p *Person) error { - ob, err := activitystreams.ToObject(&p.Parent) + ob, err := ToObject(&p.Parent) if err != nil { return err } return fn(ob) }) } else { - ob, err := activitystreams.ToObject(it) + ob, err := ToObject(it) if err != nil { return err }
• object.go
  • @@ -1,6 +1,7 @@
    package activitypub import ( + "errors" "github.com/buger/jsonparser" as "github.com/go-ap/activitystreams" )
  • @@ -54,3 +55,18 @@ func (o *Object) UnmarshalJSON(data []byte) error {
    o.Source = GetAPSource(data) return nil } + + // ToObject + func ToObject(it as.Item) (*Object, error) { + switch i := it.(type) { + case *as.Object: + return &Object{Parent: *i}, nil + case as.Object: + return &Object{Parent: i}, nil + case *Object: + return i, nil + case Object: + return &i, nil + } + return nil, errors.New("unable to convert object") + }