From dc338dc881ead40723f0540aac7fe894f58b174d Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Sun, 9 May 2021 20:34:27 +0200 Subject: Webfinger + Small fixes (#20) --- internal/typeutils/astointernal.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'internal/typeutils/astointernal.go') diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index 5e3b6b052..7842411ea 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -119,31 +119,26 @@ func (c *converter) ASRepresentationToAccount(accountable Accountable) (*gtsmode acct.URL = url.String() // InboxURI - if accountable.GetActivityStreamsInbox() == nil || accountable.GetActivityStreamsInbox().GetIRI() == nil { - return nil, fmt.Errorf("person with id %s had no inbox uri", uri.String()) + if accountable.GetActivityStreamsInbox() != nil || accountable.GetActivityStreamsInbox().GetIRI() != nil { + acct.InboxURI = accountable.GetActivityStreamsInbox().GetIRI().String() } - acct.InboxURI = accountable.GetActivityStreamsInbox().GetIRI().String() // OutboxURI - if accountable.GetActivityStreamsOutbox() == nil || accountable.GetActivityStreamsOutbox().GetIRI() == nil { - return nil, fmt.Errorf("person with id %s had no outbox uri", uri.String()) + if accountable.GetActivityStreamsOutbox() != nil && accountable.GetActivityStreamsOutbox().GetIRI() != nil { + acct.OutboxURI = accountable.GetActivityStreamsOutbox().GetIRI().String() } - acct.OutboxURI = accountable.GetActivityStreamsOutbox().GetIRI().String() // FollowingURI - if accountable.GetActivityStreamsFollowing() == nil || accountable.GetActivityStreamsFollowing().GetIRI() == nil { - return nil, fmt.Errorf("person with id %s had no following uri", uri.String()) + if accountable.GetActivityStreamsFollowing() != nil && accountable.GetActivityStreamsFollowing().GetIRI() != nil { + acct.FollowingURI = accountable.GetActivityStreamsFollowing().GetIRI().String() } - acct.FollowingURI = accountable.GetActivityStreamsFollowing().GetIRI().String() // FollowersURI - if accountable.GetActivityStreamsFollowers() == nil || accountable.GetActivityStreamsFollowers().GetIRI() == nil { - return nil, fmt.Errorf("person with id %s had no followers uri", uri.String()) + if accountable.GetActivityStreamsFollowers() != nil && accountable.GetActivityStreamsFollowers().GetIRI() != nil { + acct.FollowersURI = accountable.GetActivityStreamsFollowers().GetIRI().String() } - acct.FollowersURI = accountable.GetActivityStreamsFollowers().GetIRI().String() // FeaturedURI - // very much optional if accountable.GetTootFeatured() != nil && accountable.GetTootFeatured().GetIRI() != nil { acct.FeaturedCollectionURI = accountable.GetTootFeatured().GetIRI().String() } -- cgit v1.2.3