From 6c9d8e78ebbd81928abab1bbb49a3c4daa7d2a3a Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 12 May 2023 10:15:54 +0100 Subject: [feature] status refetch support (#1690) * revamp http client to not limit requests, instead use sender worker Signed-off-by: kim * remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping Signed-off-by: kim * improve batch senders to keep popping recipients until remote URL found Signed-off-by: kim * fix recipient looping issue Signed-off-by: kim * move request id ctx key to gtscontext, finish filling out more code comments, add basic support for not logging client IP Signed-off-by: kim * first draft of status refetching logic Signed-off-by: kim * fix testrig to use new federation alloc func signature Signed-off-by: kim * fix log format directive Signed-off-by: kim * add status fetched_at migration Signed-off-by: kim * remove unused / unchecked for error types Signed-off-by: kim * add back the used type... Signed-off-by: kim * add separate internal getStatus() function for derefThread() that doesn't recurse Signed-off-by: kim * improved mention and media attachment error handling Signed-off-by: kim * fix log and error format directives Signed-off-by: kim * update account deref to match status deref changes Signed-off-by: kim * very small code formatting change to make things clearer Signed-off-by: kim * add more code comments Signed-off-by: kim * improved code commenting Signed-off-by: kim * only check for required further derefs if needed Signed-off-by: kim * improved cache invalidation Signed-off-by: kim * tweak cache restarting to use a (very small) backoff Signed-off-by: kim * small readability changes and fixes Signed-off-by: kim * fix account sync issues Signed-off-by: kim * fix merge conflicts + update account enrichment to accept already-passed accountable Signed-off-by: kim * remove secondary function declaration Signed-off-by: kim * normalise dereferencer get status / account behaviour, fix remaining tests Signed-off-by: kim * fix remaining rebase conflicts, finish commenting code Signed-off-by: kim * appease the linter Signed-off-by: kim * add source file header Signed-off-by: kim * update to use TIMESTAMPTZ column type instead of just TIMESTAMP Signed-off-by: kim * don't pass in 'updated_at' to UpdateEmoji() Signed-off-by: kim * use new ap.Resolve{Account,Status}able() functions Signed-off-by: kim * remove the somewhat confusing rescoping of the same variable names Signed-off-by: kim * update migration file name, improved database delete error returns Signed-off-by: kim * formatting Signed-off-by: kim * improved multi-delete database functions to minimise DB calls Signed-off-by: kim * remove unused type Signed-off-by: kim * fix delete statements Signed-off-by: kim --------- Signed-off-by: kim --- internal/processing/account/get.go | 51 ++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'internal/processing/account/get.go') diff --git a/internal/processing/account/get.go b/internal/processing/account/get.go index c7d271b0a..ddb7c14e0 100644 --- a/internal/processing/account/get.go +++ b/internal/processing/account/get.go @@ -28,16 +28,17 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" ) // Get processes the given request for account information. func (p *Processor) Get(ctx context.Context, requestingAccount *gtsmodel.Account, targetAccountID string) (*apimodel.Account, gtserror.WithCode) { targetAccount, err := p.state.DB.GetAccountByID(ctx, targetAccountID) if err != nil { - if err == db.ErrNoEntries { + if errors.Is(err, db.ErrNoEntries) { return nil, gtserror.NewErrorNotFound(errors.New("account not found")) } - return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %s", err)) + return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %w", err)) } return p.getFor(ctx, requestingAccount, targetAccount) @@ -47,10 +48,10 @@ func (p *Processor) Get(ctx context.Context, requestingAccount *gtsmodel.Account func (p *Processor) GetLocalByUsername(ctx context.Context, requestingAccount *gtsmodel.Account, username string) (*apimodel.Account, gtserror.WithCode) { targetAccount, err := p.state.DB.GetAccountByUsernameDomain(ctx, username, "") if err != nil { - if err == db.ErrNoEntries { + if errors.Is(err, db.ErrNoEntries) { return nil, gtserror.NewErrorNotFound(errors.New("account not found")) } - return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %s", err)) + return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %w", err)) } return p.getFor(ctx, requestingAccount, targetAccount) @@ -60,56 +61,58 @@ func (p *Processor) GetLocalByUsername(ctx context.Context, requestingAccount *g func (p *Processor) GetCustomCSSForUsername(ctx context.Context, username string) (string, gtserror.WithCode) { customCSS, err := p.state.DB.GetAccountCustomCSSByUsername(ctx, username) if err != nil { - if err == db.ErrNoEntries { + if errors.Is(err, db.ErrNoEntries) { return "", gtserror.NewErrorNotFound(errors.New("account not found")) } - return "", gtserror.NewErrorInternalError(fmt.Errorf("db error: %s", err)) + return "", gtserror.NewErrorInternalError(fmt.Errorf("db error: %w", err)) } return customCSS, nil } func (p *Processor) getFor(ctx context.Context, requestingAccount *gtsmodel.Account, targetAccount *gtsmodel.Account) (*apimodel.Account, gtserror.WithCode) { - var blocked bool var err error + if requestingAccount != nil { - blocked, err = p.state.DB.IsEitherBlocked(ctx, requestingAccount.ID, targetAccount.ID) + blocked, err := p.state.DB.IsEitherBlocked(ctx, requestingAccount.ID, targetAccount.ID) if err != nil { - return nil, gtserror.NewErrorInternalError(fmt.Errorf("error checking account block: %s", err)) + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error checking account block: %w", err)) } - } - var apiAccount *apimodel.Account - if blocked { - apiAccount, err = p.tc.AccountToAPIAccountBlocked(ctx, targetAccount) - if err != nil { - return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %s", err)) + if blocked { + apiAccount, err := p.tc.AccountToAPIAccountBlocked(ctx, targetAccount) + if err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %w", err)) + } + return apiAccount, nil } - return apiAccount, nil } - // last-minute check to make sure we have remote account header/avi cached if targetAccount.Domain != "" { targetAccountURI, err := url.Parse(targetAccount.URI) if err != nil { - return nil, gtserror.NewErrorInternalError(fmt.Errorf("error parsing url %s: %s", targetAccount.URI, err)) + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error parsing url %s: %w", targetAccount.URI, err)) } - a, err := p.federator.GetAccountByURI( - gtscontext.SetFastFail(ctx), requestingAccount.Username, targetAccountURI, - ) - if err == nil { - targetAccount = a + // Perform a last-minute fetch of target account to ensure remote account header / avatar is cached. + latest, _, err := p.federator.GetAccountByURI(gtscontext.SetFastFail(ctx), requestingAccount.Username, targetAccountURI) + if err != nil { + log.Errorf(ctx, "error fetching latest target account: %v", err) + } else { + // Use latest account model. + targetAccount = latest } } + var apiAccount *apimodel.Account + if requestingAccount != nil && targetAccount.ID == requestingAccount.ID { apiAccount, err = p.tc.AccountToAPIAccountSensitive(ctx, targetAccount) } else { apiAccount, err = p.tc.AccountToAPIAccountPublic(ctx, targetAccount) } if err != nil { - return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %s", err)) + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %w", err)) } return apiAccount, nil -- cgit v1.2.3