From 33aee1b1e974e99182a95ce1a05e2be924d19bb2 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:03:05 +0000 Subject: [chore] reformat GetAccount() functionality, support updating accounts based on last_fetch (#1411) * reformat GetAccount() functionality, and add UpdateAccount() function. * use fetched_at instead of last_webfingered_at * catch local "not found" errors. small formatting / error string changes * remove now unused error type * return nil when wrapping nil error * update expected error messages * return correct url for foss satan webfinger * add AP model for Some_User * normalize local domain * return notretrievable where appropriate * expose NewErrNotRetrievable * ensure webfinger for new accounts searched by uri * update local account short circuit * allow enrich to fail for already-known accounts * remove unused LastWebfingeredAt * expose test maps on mock http client * update Update test * reformat GetAccount() functionality, and add UpdateAccount() function. * use fetched_at instead of last_webfingered_at * catch local "not found" errors. small formatting / error string changes * remove nil error checks (we shouldn't be passing nil errors to newError() initializers) * remove mutex unlock on transport init fail (it hasn't yet been locked!) * woops add back the error wrapping to use ErrNotRetrievable * caches were never being started... :see_no_evil: --------- Signed-off-by: kim Co-authored-by: tsmethurst --- internal/processing/fromfederator.go | 54 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'internal/processing/fromfederator.go') 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) } -- cgit v1.2.3