1 files changed, 28 insertions, 54 deletions

diff --git a/internal/processing/followrequest.go b/internal/processing/followrequest.go
index 2b45108c6..7b8c36050 100644
--- a/internal/processing/followrequest.go
+++ b/internal/processing/followrequest.go
@@ -19,34 +19,33 @@ package processing
 
 import (
 	"context"
+	"errors"
 
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 	"github.com/superseriousbusiness/gotosocial/internal/messages"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 )
 
 func (p *Processor) FollowRequestsGet(ctx context.Context, auth *oauth.Auth) ([]apimodel.Account, gtserror.WithCode) {
-	frs, err := p.state.DB.GetAccountFollowRequests(ctx, auth.Account.ID)
-	if err != nil {
-		if err != db.ErrNoEntries {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
+	followRequests, err := p.state.DB.GetFollowRequests(ctx, "", auth.Account.ID)
+	if err != nil && !errors.Is(err, db.ErrNoEntries) {
+		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	accts := []apimodel.Account{}
-	for _, fr := range frs {
-		if fr.Account == nil {
-			frAcct, err := p.state.DB.GetAccountByID(ctx, fr.AccountID)
-			if err != nil {
-				return nil, gtserror.NewErrorInternalError(err)
-			}
-			fr.Account = frAcct
+	accts := make([]apimodel.Account, 0, len(followRequests))
+	for _, followRequest := range followRequests {
+		if followRequest.Account == nil {
+			// The creator of the follow doesn't exist,
+			// just skip this one.
+			log.WithContext(ctx).WithField("followRequest", followRequest).Warn("follow request had no associated account")
+			continue
 		}
 
-		apiAcct, err := p.tc.AccountToAPIAccountPublic(ctx, fr.Account)
+		apiAcct, err := p.tc.AccountToAPIAccountPublic(ctx, followRequest.Account)
 		if err != nil {
 			return nil, gtserror.NewErrorInternalError(err)
 		}
@@ -62,19 +61,10 @@ func (p *Processor) FollowRequestAccept(ctx context.Context, auth *oauth.Auth, a
 	}
 
 	if follow.Account == nil {
-		followAccount, err := p.state.DB.GetAccountByID(ctx, follow.AccountID)
-		if err != nil {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
-		follow.Account = followAccount
-	}
-
-	if follow.TargetAccount == nil {
-		followTargetAccount, err := p.state.DB.GetAccountByID(ctx, follow.TargetAccountID)
-		if err != nil {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
-		follow.TargetAccount = followTargetAccount
+		// The creator of the follow doesn't exist,
+		// so we can't do further processing.
+		log.WithContext(ctx).WithField("follow", follow).Warn("follow had no associated account")
+		return p.relationship(ctx, auth.Account.ID, accountID)
 	}
 
 	p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{
@@ -85,17 +75,7 @@ func (p *Processor) FollowRequestAccept(ctx context.Context, auth *oauth.Auth, a
 		TargetAccount:  follow.TargetAccount,
 	})
 
-	gtsR, err := p.state.DB.GetRelationship(ctx, auth.Account.ID, accountID)
-	if err != nil {
-		return nil, gtserror.NewErrorInternalError(err)
-	}
-
-	r, err := p.tc.RelationshipToAPIRelationship(ctx, gtsR)
-	if err != nil {
-		return nil, gtserror.NewErrorInternalError(err)
-	}
-
-	return r, nil
+	return p.relationship(ctx, auth.Account.ID, accountID)
 }
 
 func (p *Processor) FollowRequestReject(ctx context.Context, auth *oauth.Auth, accountID string) (*apimodel.Relationship, gtserror.WithCode) {
@@ -105,19 +85,9 @@ func (p *Processor) FollowRequestReject(ctx context.Context, auth *oauth.Auth, a
 	}
 
 	if followRequest.Account == nil {
-		a, err := p.state.DB.GetAccountByID(ctx, followRequest.AccountID)
-		if err != nil {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
-		followRequest.Account = a
-	}
-
-	if followRequest.TargetAccount == nil {
-		a, err := p.state.DB.GetAccountByID(ctx, followRequest.TargetAccountID)
-		if err != nil {
-			return nil, gtserror.NewErrorInternalError(err)
-		}
-		followRequest.TargetAccount = a
+		// The creator of the request doesn't exist,
+		// so we can't do further processing.
+		return p.relationship(ctx, auth.Account.ID, accountID)
 	}
 
 	p.state.Workers.EnqueueClientAPI(ctx, messages.FromClientAPI{
@@ -128,15 +98,19 @@ func (p *Processor) FollowRequestReject(ctx context.Context, auth *oauth.Auth, a
 		TargetAccount:  followRequest.TargetAccount,
 	})
 
-	gtsR, err := p.state.DB.GetRelationship(ctx, auth.Account.ID, accountID)
+	return p.relationship(ctx, auth.Account.ID, accountID)
+}
+
+func (p *Processor) relationship(ctx context.Context, accountID string, targetAccountID string) (*apimodel.Relationship, gtserror.WithCode) {
+	relationship, err := p.state.DB.GetRelationship(ctx, accountID, targetAccountID)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	r, err := p.tc.RelationshipToAPIRelationship(ctx, gtsR)
+	apiRelationship, err := p.tc.RelationshipToAPIRelationship(ctx, relationship)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	return r, nil
+	return apiRelationship, nil
 }