diff options
author | 2022-11-20 16:33:49 +0000 | |
---|---|---|
committer | 2022-11-20 16:33:49 +0000 | |
commit | 5d55e8d920cd5969e5cff567ee88afb13f40a1b9 (patch) | |
tree | 7ad27cd4ae90a124a8d5ec04e7ff5ac9a1d27d26 /internal/processing/account/removeblock.go | |
parent | [bugfix] fix possible infinite loop on federated AP profile delete (#1091) (diff) | |
download | gotosocial-5d55e8d920cd5969e5cff567ee88afb13f40a1b9.tar.xz |
[performance] add account block DB cache and remove block query joins (#1085)
* add account block DB cache and remove reliance on relational joins
* actually include cache key arguments...
* add a PutBlock() method which also updates the block cache, update tests accordingly
* use `PutBlock` instead of `Put(ctx, block)`
* add + use functions for deleting + invalidating blocks
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/processing/account/removeblock.go')
-rw-r--r-- | internal/processing/account/removeblock.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/internal/processing/account/removeblock.go b/internal/processing/account/removeblock.go index f15350a12..7f34e0f4f 100644 --- a/internal/processing/account/removeblock.go +++ b/internal/processing/account/removeblock.go @@ -20,6 +20,7 @@ package account import ( "context" + "errors" "fmt" "github.com/superseriousbusiness/gotosocial/internal/ap" @@ -37,23 +38,17 @@ func (p *processor) BlockRemove(ctx context.Context, requestingAccount *gtsmodel return nil, gtserror.NewErrorNotFound(fmt.Errorf("BlockCreate: error getting account %s from the db: %s", targetAccountID, err)) } - // check if a block exists, and remove it if it does (storing the URI for later) - var blockChanged bool - block := >smodel.Block{} - if err := p.db.GetWhere(ctx, []db.Where{ - {Key: "account_id", Value: requestingAccount.ID}, - {Key: "target_account_id", Value: targetAccountID}, - }, block); err == nil { + // check if a block exists, and remove it if it does + block, err := p.db.GetBlock(ctx, requestingAccount.ID, targetAccountID) + if err == nil { + // we got a block, remove it block.Account = requestingAccount block.TargetAccount = targetAccount - if err := p.db.DeleteByID(ctx, block.ID, >smodel.Block{}); err != nil { + if err := p.db.DeleteBlockByID(ctx, block.ID); err != nil { return nil, gtserror.NewErrorInternalError(fmt.Errorf("BlockRemove: error removing block from db: %s", err)) } - blockChanged = true - } - // block status changed so send the UNDO activity to the channel for async processing - if blockChanged { + // send the UNDO activity to the client worker for async processing p.clientWorker.Queue(messages.FromClientAPI{ APObjectType: ap.ActivityBlock, APActivityType: ap.ActivityUndo, @@ -61,6 +56,8 @@ func (p *processor) BlockRemove(ctx context.Context, requestingAccount *gtsmodel OriginAccount: requestingAccount, TargetAccount: targetAccount, }) + } else if !errors.Is(err, db.ErrNoEntries) { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("BlockRemove: error getting possible block from db: %s", err)) } // return whatever relationship results from all this |