diff options
Diffstat (limited to 'internal/typeutils')
| -rw-r--r-- | internal/typeutils/astointernal.go | 21 | ||||
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 8 |
2 files changed, 12 insertions, 17 deletions
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() } diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 6b0c743ff..861350b44 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -554,11 +554,11 @@ func (c *converter) VisToMasto(m gtsmodel.Visibility) model.Visibility { func (c *converter) InstanceToMasto(i *gtsmodel.Instance) (*model.Instance, error) { mi := &model.Instance{ - URI: i.URI, - Title: i.Title, - Description: i.Description, + URI: i.URI, + Title: i.Title, + Description: i.Description, ShortDescription: i.ShortDescription, - Email: i.ContactEmail, + Email: i.ContactEmail, } if i.Domain == c.config.Host { |