diff options
Diffstat (limited to 'internal/db/bundb/relationship_follow.go')
| -rw-r--r-- | internal/db/bundb/relationship_follow.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/internal/db/bundb/relationship_follow.go b/internal/db/bundb/relationship_follow.go index 3b0597612..e22ed30de 100644 --- a/internal/db/bundb/relationship_follow.go +++ b/internal/db/bundb/relationship_follow.go @@ -160,7 +160,7 @@ func (r *relationshipDB) getFollow(ctx context.Context, lookup string, dbQuery f func (r *relationshipDB) PopulateFollow(ctx context.Context, follow *gtsmodel.Follow) error { var ( err error - errs = make(gtserror.MultiError, 0, 2) + errs = gtserror.NewMultiError(2) ) if follow.Account == nil { @@ -170,7 +170,7 @@ func (r *relationshipDB) PopulateFollow(ctx context.Context, follow *gtsmodel.Fo follow.AccountID, ) if err != nil { - errs.Append(fmt.Errorf("error populating follow account: %w", err)) + errs.Appendf("error populating follow account: %w", err) } } @@ -181,11 +181,15 @@ func (r *relationshipDB) PopulateFollow(ctx context.Context, follow *gtsmodel.Fo follow.TargetAccountID, ) if err != nil { - errs.Append(fmt.Errorf("error populating follow target account: %w", err)) + errs.Appendf("error populating follow target account: %w", err) } } - return errs.Combine() + if err := errs.Combine(); err != nil { + return gtserror.Newf("%w", err) + } + + return nil } func (r *relationshipDB) PutFollow(ctx context.Context, follow *gtsmodel.Follow) error { |