diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-11-22 12:48:46 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-11-22 12:48:46 +0100 |
| commit | b46e5fb65d10be79f553505dc25e575de97f142f (patch) | |
| tree | b1c3c04c34a9400d3813f7d6889f91f6aa765dc9 /internal/typeutils/internaltoas.go | |
| parent | Fix image description unnecessarily html-escaping innocent characters (#321) (diff) | |
| download | gotosocial-b46e5fb65d10be79f553505dc25e575de97f142f.tar.xz | |
Fix incorrect target being used in CC prop for mentioning statuses (#322)
* hardcode time on admin_account_status_3
* add test for as status with mention
* fix incorrect target URI being used for mentions
Diffstat (limited to 'internal/typeutils/internaltoas.go')
| -rw-r--r-- | internal/typeutils/internaltoas.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go index 7afb65f21..ae8e3b1f2 100644 --- a/internal/typeutils/internaltoas.go +++ b/internal/typeutils/internaltoas.go @@ -464,9 +464,9 @@ func (c *converter) StatusToAS(ctx context.Context, s *gtsmodel.Status) (vocab.A case gtsmodel.VisibilityDirect: // if DIRECT, then only mentioned users should be added to TO, and nothing to CC for _, m := range s.Mentions { - iri, err := url.Parse(m.OriginAccount.URI) + iri, err := url.Parse(m.TargetAccount.URI) if err != nil { - return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.OriginAccount.URI, err) + return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.TargetAccount.URI, err) } toProp.AppendIRI(iri) } @@ -476,9 +476,9 @@ func (c *converter) StatusToAS(ctx context.Context, s *gtsmodel.Status) (vocab.A // if FOLLOWERS ONLY then we want to add followers to TO, and mentions to CC toProp.AppendIRI(authorFollowersURI) for _, m := range s.Mentions { - iri, err := url.Parse(m.OriginAccount.URI) + iri, err := url.Parse(m.TargetAccount.URI) if err != nil { - return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.OriginAccount.URI, err) + return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.TargetAccount.URI, err) } ccProp.AppendIRI(iri) } @@ -487,9 +487,9 @@ func (c *converter) StatusToAS(ctx context.Context, s *gtsmodel.Status) (vocab.A toProp.AppendIRI(authorFollowersURI) ccProp.AppendIRI(publicURI) for _, m := range s.Mentions { - iri, err := url.Parse(m.OriginAccount.URI) + iri, err := url.Parse(m.TargetAccount.URI) if err != nil { - return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.OriginAccount.URI, err) + return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.TargetAccount.URI, err) } ccProp.AppendIRI(iri) } @@ -498,9 +498,9 @@ func (c *converter) StatusToAS(ctx context.Context, s *gtsmodel.Status) (vocab.A toProp.AppendIRI(publicURI) ccProp.AppendIRI(authorFollowersURI) for _, m := range s.Mentions { - iri, err := url.Parse(m.OriginAccount.URI) + iri, err := url.Parse(m.TargetAccount.URI) if err != nil { - return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.OriginAccount.URI, err) + return nil, fmt.Errorf("StatusToAS: error parsing uri %s: %s", m.TargetAccount.URI, err) } ccProp.AppendIRI(iri) } |