summaryrefslogtreecommitdiff
path: root/internal/db/bundb/relationship_block.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-08-09 19:14:33 +0200
committerLibravatar GitHub <noreply@github.com>2023-08-09 19:14:33 +0200
commit9770d54237bea828cab7e50aec7dff452c203138 (patch)
tree59c444a02e81925bab47d3656a489a8c7087d530 /internal/db/bundb/relationship_block.go
parent[bugfix] Fix incorrect per-loop variable capture (#2092) (diff)
downloadgotosocial-9770d54237bea828cab7e50aec7dff452c203138.tar.xz
[feature] List replies policy, refactor async workers (#2087)
* Add/update some DB functions. * move async workers into subprocessor * rename FromFederator -> FromFediAPI * update home timeline check to include check for current status first before moving to parent status * change streamMap to pointer to mollify linter * update followtoas func signature * fix merge * remove errant debug log * don't use separate errs.Combine() check to wrap errs * wrap parts of workers functionality in sub-structs * populate report using new db funcs * embed federator (tiny bit tidier) * flesh out error msg, add continue(!) * fix other error messages to be more specific * better, nicer * give parseURI util function a bit more util * missing headers * use pointers for subprocessors
Diffstat (limited to 'internal/db/bundb/relationship_block.go')
-rw-r--r--internal/db/bundb/relationship_block.go47
1 files changed, 32 insertions, 15 deletions
diff --git a/internal/db/bundb/relationship_block.go b/internal/db/bundb/relationship_block.go
index 2a042bed4..33a3b85fa 100644
--- a/internal/db/bundb/relationship_block.go
+++ b/internal/db/bundb/relationship_block.go
@@ -20,10 +20,10 @@ package bundb
import (
"context"
"errors"
- "fmt"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/uptrace/bun"
@@ -139,25 +139,42 @@ func (r *relationshipDB) getBlock(ctx context.Context, lookup string, dbQuery fu
return block, nil
}
- // Set the block source account
- block.Account, err = r.state.DB.GetAccountByID(
- gtscontext.SetBarebones(ctx),
- block.AccountID,
- )
- if err != nil {
- return nil, fmt.Errorf("error getting block source account: %w", err)
+ if err := r.state.DB.PopulateBlock(ctx, block); err != nil {
+ return nil, err
}
- // Set the block target account
- block.TargetAccount, err = r.state.DB.GetAccountByID(
- gtscontext.SetBarebones(ctx),
- block.TargetAccountID,
+ return block, nil
+}
+
+func (r *relationshipDB) PopulateBlock(ctx context.Context, block *gtsmodel.Block) error {
+ var (
+ err error
+ errs = gtserror.NewMultiError(2)
)
- if err != nil {
- return nil, fmt.Errorf("error getting block target account: %w", err)
+
+ if block.Account == nil {
+ // Block origin account is not set, fetch from database.
+ block.Account, err = r.state.DB.GetAccountByID(
+ gtscontext.SetBarebones(ctx),
+ block.AccountID,
+ )
+ if err != nil {
+ errs.Appendf("error populating block account: %w", err)
+ }
}
- return block, nil
+ if block.TargetAccount == nil {
+ // Block target account is not set, fetch from database.
+ block.TargetAccount, err = r.state.DB.GetAccountByID(
+ gtscontext.SetBarebones(ctx),
+ block.TargetAccountID,
+ )
+ if err != nil {
+ errs.Appendf("error populating block target account: %w", err)
+ }
+ }
+
+ return errs.Combine()
}
func (r *relationshipDB) PutBlock(ctx context.Context, block *gtsmodel.Block) error {