From de6e3e5f2a8ea639d76e310a11cb9bc093fef3a9 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:03:14 +0100 Subject: [performance] refactoring + add fave / follow / request / visibility caching (#1607) * refactor visibility checking, add caching for visibility * invalidate visibility cache items on account / status deletes * fix requester ID passed to visibility cache nil ptr * de-interface caches, fix home / public timeline caching + visibility * finish adding code comments for visibility filter * fix angry goconst linter warnings * actually finish adding filter visibility code comments for timeline functions * move home timeline status author check to after visibility * remove now-unused code * add more code comments * add TODO code comment, update printed cache start names * update printed cache names on stop * start adding separate follow(request) delete db functions, add specific visibility cache tests * add relationship type caching * fix getting local account follows / followed-bys, other small codebase improvements * simplify invalidation using cache hooks, add more GetAccountBy___() functions * fix boosting to return 404 if not boostable but no error (to not leak status ID) * remove dead code * improved placement of cache invalidation * update license headers * add example follow, follow-request config entries * add example visibility cache configuration to config file * use specific PutFollowRequest() instead of just Put() * add tests for all GetAccountBy() * add GetBlockBy() tests * update block to check primitive fields * update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests * fix copy-pasted code * update envparsing test * whitespace * fix bun struct tag * add license header to gtscontext * fix old license header * improved error creation to not use fmt.Errorf() when not needed * fix various rebase conflicts, fix account test * remove commented-out code, fix-up mention caching * fix mention select bun statement * ensure mention target account populated, pass in context to customrenderer logging * remove more uncommented code, fix typeutil test * add statusfave database model caching * add status fave cache configuration * add status fave cache example config * woops, catch missed error. nice catch linter! * add back testrig panic on nil db * update example configuration to match defaults, slight tweak to cache configuration defaults * update envparsing test with new defaults * fetch followingget to use the follow target account * use accounnt.IsLocal() instead of empty domain check * use constants for the cache visibility type check * use bun.In() for notification type restriction in db query * include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable()) * use bun query building for nested select statements to ensure working with postgres * update public timeline future status checks to match visibility filter * same as previous, for home timeline * update public timeline tests to dynamically check for appropriate statuses * migrate accounts to allow unique constraint on public_key * provide minimal account with publicKey --------- Signed-off-by: kim Co-authored-by: tsmethurst --- internal/processing/status/boost.go | 13 ++++++------- internal/processing/status/common.go | 7 +------ internal/processing/status/create.go | 2 +- internal/processing/status/fave.go | 8 ++++---- internal/processing/status/get.go | 4 ++-- internal/processing/status/status.go | 6 +++--- internal/processing/status/status_test.go | 5 ++++- 7 files changed, 21 insertions(+), 24 deletions(-) (limited to 'internal/processing/status') diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go index f5b5a4052..e5d38d9d2 100644 --- a/internal/processing/status/boost.go +++ b/internal/processing/status/boost.go @@ -55,12 +55,11 @@ func (p *Processor) BoostCreate(ctx context.Context, requestingAccount *gtsmodel targetStatus = targetStatus.BoostOf } - boostable, err := p.filter.StatusBoostable(ctx, targetStatus, requestingAccount) + boostable, err := p.filter.StatusBoostable(ctx, requestingAccount, targetStatus) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("error seeing if status %s is boostable: %s", targetStatus.ID, err)) - } - if !boostable { - return nil, gtserror.NewErrorForbidden(errors.New("status is not boostable")) + } else if !boostable { + return nil, gtserror.NewErrorNotFound(errors.New("status is not boostable")) } // it's visible! it's boostable! so let's boost the FUCK out of it @@ -99,7 +98,7 @@ func (p *Processor) BoostRemove(ctx context.Context, requestingAccount *gtsmodel return nil, gtserror.NewErrorNotFound(fmt.Errorf("no status owner for status %s", targetStatusID)) } - visible, err := p.filter.StatusVisible(ctx, targetStatus, requestingAccount) + visible, err := p.filter.StatusVisible(ctx, requestingAccount, targetStatus) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("error seeing if status %s is visible: %s", targetStatus.ID, err)) } @@ -180,7 +179,7 @@ func (p *Processor) StatusBoostedBy(ctx context.Context, requestingAccount *gtsm targetStatus = boostedStatus } - visible, err := p.filter.StatusVisible(ctx, targetStatus, requestingAccount) + visible, err := p.filter.StatusVisible(ctx, requestingAccount, targetStatus) if err != nil { err = fmt.Errorf("BoostedBy: error seeing if status %s is visible: %s", targetStatus.ID, err) return nil, gtserror.NewErrorNotFound(err) @@ -199,7 +198,7 @@ func (p *Processor) StatusBoostedBy(ctx context.Context, requestingAccount *gtsm // filter account IDs so the user doesn't see accounts they blocked or which blocked them accountIDs := make([]string, 0, len(statusReblogs)) for _, s := range statusReblogs { - blocked, err := p.state.DB.IsBlocked(ctx, requestingAccount.ID, s.AccountID, true) + blocked, err := p.state.DB.IsEitherBlocked(ctx, requestingAccount.ID, s.AccountID) if err != nil { err = fmt.Errorf("BoostedBy: error checking blocks: %s", err) return nil, gtserror.NewErrorNotFound(err) diff --git a/internal/processing/status/common.go b/internal/processing/status/common.go index 5b73e9c94..d6478d35a 100644 --- a/internal/processing/status/common.go +++ b/internal/processing/status/common.go @@ -43,12 +43,7 @@ func (p *Processor) getVisibleStatus(ctx context.Context, requestingAccount *gts return nil, gtserror.NewErrorNotFound(err) } - if targetStatus.Account == nil { - err = fmt.Errorf("getVisibleStatus: no status owner for status %s", targetStatusID) - return nil, gtserror.NewErrorNotFound(err) - } - - visible, err := p.filter.StatusVisible(ctx, targetStatus, requestingAccount) + visible, err := p.filter.StatusVisible(ctx, requestingAccount, targetStatus) if err != nil { err = fmt.Errorf("getVisibleStatus: error seeing if status %s is visible: %w", targetStatus.ID, err) return nil, gtserror.NewErrorNotFound(err) diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index 71db8c18e..2d9c3a196 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -133,7 +133,7 @@ func processReplyToID(ctx context.Context, dbService db.DB, form *apimodel.Advan return gtserror.NewErrorInternalError(err) } - if blocked, err := dbService.IsBlocked(ctx, thisAccountID, repliedAccount.ID, true); err != nil { + if blocked, err := dbService.IsEitherBlocked(ctx, thisAccountID, repliedAccount.ID); err != nil { err := fmt.Errorf("db error checking block: %s", err) return gtserror.NewErrorInternalError(err) } else if blocked { diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go index da1bae8a1..77d3f67e9 100644 --- a/internal/processing/status/fave.go +++ b/internal/processing/status/fave.go @@ -88,7 +88,7 @@ func (p *Processor) FaveRemove(ctx context.Context, requestingAccount *gtsmodel. } // We have a fave to remove. - if err := p.state.DB.DeleteStatusFave(ctx, existingFave.ID); err != nil { + if err := p.state.DB.DeleteStatusFaveByID(ctx, existingFave.ID); err != nil { err = fmt.Errorf("FaveRemove: error removing status fave: %w", err) return nil, gtserror.NewErrorInternalError(err) } @@ -112,7 +112,7 @@ func (p *Processor) FavedBy(ctx context.Context, requestingAccount *gtsmodel.Acc return nil, errWithCode } - statusFaves, err := p.state.DB.GetStatusFaves(ctx, targetStatus.ID) + statusFaves, err := p.state.DB.GetStatusFavesForStatus(ctx, targetStatus.ID) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("FavedBy: error seeing who faved status: %s", err)) } @@ -122,7 +122,7 @@ func (p *Processor) FavedBy(ctx context.Context, requestingAccount *gtsmodel.Acc // and which don't block them. apiAccounts := make([]*apimodel.Account, 0, len(statusFaves)) for _, fave := range statusFaves { - if blocked, err := p.state.DB.IsBlocked(ctx, requestingAccount.ID, fave.AccountID, true); err != nil { + if blocked, err := p.state.DB.IsEitherBlocked(ctx, requestingAccount.ID, fave.AccountID); err != nil { err = fmt.Errorf("FavedBy: error checking blocks: %w", err) return nil, gtserror.NewErrorInternalError(err) } else if blocked { @@ -157,7 +157,7 @@ func (p *Processor) getFaveTarget(ctx context.Context, requestingAccount *gtsmod return nil, nil, gtserror.NewErrorForbidden(err, err.Error()) } - fave, err := p.state.DB.GetStatusFaveByAccountID(ctx, requestingAccount.ID, targetStatusID) + fave, err := p.state.DB.GetStatusFave(ctx, requestingAccount.ID, targetStatusID) if err != nil && !errors.Is(err, db.ErrNoEntries) { err = fmt.Errorf("getFaveTarget: error checking existing fave: %w", err) return nil, nil, gtserror.NewErrorInternalError(err) diff --git a/internal/processing/status/get.go b/internal/processing/status/get.go index 251a095de..236f6f126 100644 --- a/internal/processing/status/get.go +++ b/internal/processing/status/get.go @@ -54,7 +54,7 @@ func (p *Processor) ContextGet(ctx context.Context, requestingAccount *gtsmodel. } for _, status := range parents { - if v, err := p.filter.StatusVisible(ctx, status, requestingAccount); err == nil && v { + if v, err := p.filter.StatusVisible(ctx, requestingAccount, status); err == nil && v { apiStatus, err := p.tc.StatusToAPIStatus(ctx, status, requestingAccount) if err == nil { context.Ancestors = append(context.Ancestors, *apiStatus) @@ -72,7 +72,7 @@ func (p *Processor) ContextGet(ctx context.Context, requestingAccount *gtsmodel. } for _, status := range children { - if v, err := p.filter.StatusVisible(ctx, status, requestingAccount); err == nil && v { + if v, err := p.filter.StatusVisible(ctx, requestingAccount, status); err == nil && v { apiStatus, err := p.tc.StatusToAPIStatus(ctx, status, requestingAccount) if err == nil { context.Descendants = append(context.Descendants, *apiStatus) diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go index 8bb9f4cca..2bc1b62ce 100644 --- a/internal/processing/status/status.go +++ b/internal/processing/status/status.go @@ -28,17 +28,17 @@ import ( type Processor struct { state *state.State tc typeutils.TypeConverter - filter visibility.Filter + filter *visibility.Filter formatter text.Formatter parseMention gtsmodel.ParseMentionFunc } // New returns a new status processor. -func New(state *state.State, tc typeutils.TypeConverter, parseMention gtsmodel.ParseMentionFunc) Processor { +func New(state *state.State, tc typeutils.TypeConverter, filter *visibility.Filter, parseMention gtsmodel.ParseMentionFunc) Processor { return Processor{ state: state, tc: tc, - filter: visibility.NewFilter(state.DB), + filter: filter, formatter: text.NewFormatter(state.DB), parseMention: parseMention, } diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go index e7e6d90fe..bef0a6e69 100644 --- a/internal/processing/status/status_test.go +++ b/internal/processing/status/status_test.go @@ -29,6 +29,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" + "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -85,7 +86,9 @@ func (suite *StatusStandardTestSuite) SetupTest() { suite.state.Storage = suite.storage suite.mediaManager = testrig.NewTestMediaManager(&suite.state) suite.federator = testrig.NewTestFederator(&suite.state, suite.tc, suite.mediaManager) - suite.status = status.New(&suite.state, suite.typeConverter, processing.GetParseMentionFunc(suite.db, suite.federator)) + + filter := visibility.NewFilter(&suite.state) + suite.status = status.New(&suite.state, suite.typeConverter, filter, processing.GetParseMentionFunc(suite.db, suite.federator)) testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../../testrig/media") -- cgit v1.2.3