diff options
author | 2021-10-06 18:18:02 +0200 | |
---|---|---|
committer | 2021-10-06 18:18:02 +0200 | |
commit | 3dc7644ae6bdbfbae2e126896937e322247b5b33 (patch) | |
tree | 45487a241b439ce590863f68ea479d8dfd92ba28 /internal/typeutils/internaltoas.go | |
parent | fix logs not working properly (#264) (diff) | |
download | gotosocial-3dc7644ae6bdbfbae2e126896937e322247b5b33.tar.xz |
Derive visibility fixes (#271)
* use pub public const
* don't error on no summary
* move extract visibility to separate function
* extract visibility test
* add addressable interface
Diffstat (limited to 'internal/typeutils/internaltoas.go')
-rw-r--r-- | internal/typeutils/internaltoas.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go index 1689db496..73d274908 100644 --- a/internal/typeutils/internaltoas.go +++ b/internal/typeutils/internaltoas.go @@ -25,6 +25,7 @@ import ( "fmt" "net/url" + "github.com/go-fed/activity/pub" "github.com/go-fed/activity/streams" "github.com/go-fed/activity/streams/vocab" "github.com/superseriousbusiness/gotosocial/internal/gtserror" @@ -444,9 +445,9 @@ func (c *converter) StatusToAS(ctx context.Context, s *gtsmodel.Status) (vocab.A return nil, fmt.Errorf("StatusToAS: error parsing url %s: %s", s.Account.FollowersURI, err) } - publicURI, err := url.Parse(asPublicURI) + publicURI, err := url.Parse(pub.PublicActivityPubIRI) if err != nil { - return nil, fmt.Errorf("StatusToAS: error parsing url %s: %s", asPublicURI, err) + return nil, fmt.Errorf("StatusToAS: error parsing url %s: %s", pub.PublicActivityPubIRI, err) } // to and cc @@ -795,9 +796,9 @@ func (c *converter) BoostToAS(ctx context.Context, boostWrapperStatus *gtsmodel. return nil, fmt.Errorf("BoostToAS: error parsing uri %s: %s", boostedAccount.URI, err) } - publicURI, err := url.Parse(asPublicURI) + publicURI, err := url.Parse(pub.PublicActivityPubIRI) if err != nil { - return nil, fmt.Errorf("BoostToAS: error parsing uri %s: %s", asPublicURI, err) + return nil, fmt.Errorf("BoostToAS: error parsing uri %s: %s", pub.PublicActivityPubIRI, err) } ccProp := streams.NewActivityStreamsCcProperty() |