diff options
| author | mariusor | 2022-11-04 09:38:20 +0100 |
|---|---|---|
| committer | mariusor | 2022-11-04 10:48:14 +0100 |
| commit | 92ecfe47bace07e80b7bcadec7e32a1a2345375a (patch) | |
| tree | ce7858bdff7dd0468726e0c324875e594d23f88b | |
| parent | ff75b785ab2b728ba8ee9bd90f4360fa6edfa403 (diff) | |
More improvements to the CollectionType.Of method
It has become a little too complex for my taste
| -rw-r--r-- | iri.go | 3 | ||||
| -rw-r--r-- | typer.go | 85 |
2 files changed, 66 insertions, 22 deletions
@@ -134,7 +134,8 @@ func (i *IRIs) GobDecode(data []byte) error { // AddPath concatenates el elements as a path to i func (i IRI) AddPath(el ...string) IRI { - return IRI(i.String() + filepath.Clean(filepath.Join("/", filepath.Join(el...)))) + iri := strings.TrimRight(i.String(), "/") + return IRI(iri + filepath.Clean(filepath.Join("/", filepath.Join(el...)))) } // GetID @@ -104,41 +104,84 @@ func (t CollectionPath) IRI(i Item) IRI { return IRIf(i.GetLink(), t) } +func (t CollectionPath) ofItemCollection(col ItemCollection) Item { + iriCol := make(ItemCollection, len(col)) + for i, it := range col { + iriCol[i] = t.Of(it) + } + return iriCol +} + +func (t CollectionPath) ofObject(ob *Object) Item { + var it Item + switch t { + case Likes: + it = ob.Likes + case Shares: + it = ob.Shares + case Replies: + it = ob.Replies + } + if it == nil { + it = t.ofIRI(ob.ID) + } + return it +} +func (t CollectionPath) ofActor(a *Actor) Item { + var it Item + switch t { + case Inbox: + it = a.Inbox + case Outbox: + it = a.Outbox + case Liked: + it = a.Liked + case Following: + it = a.Following + case Followers: + it = a.Followers + } + if it == nil { + it = t.ofIRI(a.ID) + } + return it +} + +func (t CollectionPath) ofIRI(iri IRI) Item { + if len(iri) == 0 { + return nil + } + return iri.AddPath(string(t)) +} + +func (t CollectionPath) ofItem(i Item) Item { + var it Item + return it +} + // Of gives us the property of the i Item that corresponds to the t CollectionPath type. func (t CollectionPath) Of(i Item) Item { if IsNil(i) { return nil } if IsIRI(i) { - return i.GetLink().AddPath(string(t)) + return t.ofIRI(i.GetLink()) } var it Item + if IsItemCollection(i) { + OnItemCollection(i, func(col *ItemCollection) error { + it = t.ofItemCollection(*col) + return nil + }) + } if OfActor.Contains(t) && ActorTypes.Contains(i.GetType()) { OnActor(i, func(a *Actor) error { - switch t { - case Inbox: - it = a.Inbox - case Outbox: - it = a.Outbox - case Liked: - it = a.Liked - case Following: - it = a.Following - case Followers: - it = a.Followers - } + it = t.ofActor(a) return nil }) } OnObject(i, func(o *Object) error { - switch t { - case Likes: - it = o.Likes - case Shares: - it = o.Shares - case Replies: - it = o.Replies - } + it = t.ofObject(o) return nil }) |