diff options
Diffstat (limited to 'internal/processing/fromfederator.go')
| -rw-r--r-- | internal/processing/fromfederator.go | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go index c30fc2692..e37488794 100644 --- a/internal/processing/fromfederator.go +++ b/internal/processing/fromfederator.go @@ -27,7 +27,6 @@ import ( "codeberg.org/gruf/go-kv" "codeberg.org/gruf/go-logger/v2/level" "github.com/superseriousbusiness/gotosocial/internal/ap" - "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" "github.com/superseriousbusiness/gotosocial/internal/log" @@ -154,11 +153,11 @@ func (p *processor) processCreateStatusFromFederator(ctx context.Context, federa return err } - a, err := p.federator.GetAccount(ctx, dereferencing.GetAccountParams{ - RequestingUsername: federatorMsg.ReceivingAccount.Username, - RemoteAccountID: remoteAccountID, - Blocking: true, - }) + a, err := p.federator.GetAccountByURI(ctx, + federatorMsg.ReceivingAccount.Username, + remoteAccountID, + true, + ) if err != nil { return err } @@ -200,11 +199,11 @@ func (p *processor) processCreateFaveFromFederator(ctx context.Context, federato return err } - a, err := p.federator.GetAccount(ctx, dereferencing.GetAccountParams{ - RequestingUsername: federatorMsg.ReceivingAccount.Username, - RemoteAccountID: remoteAccountID, - Blocking: true, - }) + a, err := p.federator.GetAccountByURI(ctx, + federatorMsg.ReceivingAccount.Username, + remoteAccountID, + true, + ) if err != nil { return err } @@ -242,11 +241,11 @@ func (p *processor) processCreateFollowRequestFromFederator(ctx context.Context, return err } - a, err := p.federator.GetAccount(ctx, dereferencing.GetAccountParams{ - RequestingUsername: federatorMsg.ReceivingAccount.Username, - RemoteAccountID: remoteAccountID, - Blocking: true, - }) + a, err := p.federator.GetAccountByURI(ctx, + federatorMsg.ReceivingAccount.Username, + remoteAccountID, + true, + ) if err != nil { return err } @@ -303,11 +302,11 @@ func (p *processor) processCreateAnnounceFromFederator(ctx context.Context, fede return err } - a, err := p.federator.GetAccount(ctx, dereferencing.GetAccountParams{ - RequestingUsername: federatorMsg.ReceivingAccount.Username, - RemoteAccountID: remoteAccountID, - Blocking: true, - }) + a, err := p.federator.GetAccountByURI(ctx, + federatorMsg.ReceivingAccount.Username, + remoteAccountID, + true, + ) if err != nil { return err } @@ -380,14 +379,11 @@ func (p *processor) processUpdateAccountFromFederator(ctx context.Context, feder } // further database updates occur inside getremoteaccount - if _, err := p.federator.GetAccount(ctx, dereferencing.GetAccountParams{ - RequestingUsername: federatorMsg.ReceivingAccount.Username, - RemoteAccountID: incomingAccountURL, - RemoteAccountHost: incomingAccount.Domain, - RemoteAccountUsername: incomingAccount.Username, - PartialAccount: incomingAccount, - Blocking: true, - }); err != nil { + if _, err := p.federator.GetAccountByURI(ctx, + federatorMsg.ReceivingAccount.Username, + incomingAccountURL, + true, + ); err != nil { return fmt.Errorf("error enriching updated account from federator: %s", err) } |