diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-10-10 12:39:25 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-10 12:39:25 +0200 |
| commit | 367bdca25093ee76b36506d8a5e6733b0aa2e2bb (patch) | |
| tree | 37b1b82ae6e9fad7e6d95b8abbb58bdb42049707 /internal/federation/federatingdb/announce.go | |
| parent | Derive visibility fixes (#271) (diff) | |
| download | gotosocial-367bdca25093ee76b36506d8a5e6733b0aa2e2bb.tar.xz | |
Handle forwarded messages (#273)
* correct path of foss_satan
* add APIri and notes
* test create forward note
* rename target => receiving account
* split up create into separate funcs
* update extractFromCtx
* tidy up from federator processing
* foss satan => http not https
* check if status in db
* mock dereference of status from IRI
* add forward message deref test
* update test with activities
* add remote_account_2 to test rig
Diffstat (limited to 'internal/federation/federatingdb/announce.go')
| -rw-r--r-- | internal/federation/federatingdb/announce.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go index 9a03ede92..49ec84509 100644 --- a/internal/federation/federatingdb/announce.go +++ b/internal/federation/federatingdb/announce.go @@ -44,12 +44,9 @@ func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStre l.Debug("entering Announce") } - targetAcct, fromFederatorChan, err := extractFromCtx(ctx) - if err != nil { - return err - } - if targetAcct == nil || fromFederatorChan == nil { - // If the target account or federator channel wasn't set on the context, that means this request didn't pass + receivingAccount, _, fromFederatorChan := extractFromCtx(ctx) + if receivingAccount == nil || fromFederatorChan == nil { + // If the receiving account or federator channel wasn't set on the context, that means this request didn't pass // through the API, but came from inside GtS as the result of another activity on this instance. That being so, // we can safely just ignore this activity, since we know we've already processed it elsewhere. return nil @@ -57,7 +54,7 @@ func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStre boost, isNew, err := f.typeConverter.ASAnnounceToStatus(ctx, announce) if err != nil { - return fmt.Errorf("ANNOUNCE: error converting announce to boost: %s", err) + return fmt.Errorf("Announce: error converting announce to boost: %s", err) } if !isNew { @@ -70,7 +67,7 @@ func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStre APObjectType: ap.ActivityAnnounce, APActivityType: ap.ActivityCreate, GTSModel: boost, - ReceivingAccount: targetAcct, + ReceivingAccount: receivingAccount, } return nil |