1 files changed, 9 insertions, 25 deletions
diff --git a/internal/federation/federatingdb/following.go b/internal/federation/federatingdb/following.go
index e42f90ad1..7b0db5660 100644
--- a/internal/federation/federatingdb/following.go
+++ b/internal/federation/federatingdb/following.go
@@ -22,9 +22,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"codeberg.org/gruf/go-kv"
 	"github.com/superseriousbusiness/activity/streams/vocab"
-	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
@@ -35,39 +33,25 @@ import (
 //
 // The library makes this call only after acquiring a lock first.
 func (f *federatingDB) Following(ctx context.Context, actorIRI *url.URL) (following vocab.ActivityStreamsCollection, err error) {
-	l := log.WithContext(ctx).
-		WithFields(kv.Fields{
-			{"id", actorIRI},
-		}...)
-	l.Debug("entering Following")
-
 	acct, err := f.getAccountForIRI(ctx, actorIRI)
 	if err != nil {
 		return nil, err
 	}
 
-	acctFollowing, err := f.state.DB.GetAccountFollows(ctx, acct.ID)
+	follows, err := f.state.DB.GetFollows(ctx, acct.ID, "")
 	if err != nil {
-		return nil, fmt.Errorf("Following: db error getting following for account id %s: %s", acct.ID, err)
+		return nil, fmt.Errorf("Following: db error getting following for account id %s: %w", acct.ID, err)
 	}
 
-	iris := []*url.URL{}
-	for _, follow := range acctFollowing {
+	iris := make([]*url.URL, 0, len(follows))
+	for _, follow := range follows {
 		if follow.TargetAccount == nil {
-			a, err := f.state.DB.GetAccountByID(ctx, follow.TargetAccountID)
-			if err != nil {
-				errWrapped := fmt.Errorf("Following: db error getting account id %s: %s", follow.TargetAccountID, err)
-				if err == db.ErrNoEntries {
-					// no entry for this account id so it's probably been deleted and we haven't caught up yet
-					l.Error(errWrapped)
-					continue
-				} else {
-					// proper error
-					return nil, errWrapped
-				}
-			}
-			follow.TargetAccount = a
+			// Follow target account no longer exists,
+			// for some reason. Skip this one.
+			log.WithContext(ctx).WithField("follow", follow).Warnf("follow missing target account %s", follow.TargetAccountID)
+			continue
 		}
+
 		u, err := url.Parse(follow.TargetAccount.URI)
 		if err != nil {
 			return nil, err