4 files changed, 9 insertions, 9 deletions
diff --git a/internal/processing/fedi/common.go b/internal/processing/fedi/common.go
index 4a83c2f97..91b3030e1 100644
--- a/internal/processing/fedi/common.go
+++ b/internal/processing/fedi/common.go
@@ -45,7 +45,7 @@ func (p *Processor) authenticate(ctx context.Context, requestedUsername string)
 		return
 	}
 
-	blocked, err := p.state.DB.IsBlocked(ctx, requestedAccount.ID, requestingAccount.ID, true)
+	blocked, err := p.state.DB.IsEitherBlocked(ctx, requestedAccount.ID, requestingAccount.ID)
 	if err != nil {
 		errWithCode = gtserror.NewErrorInternalError(err)
 		return
diff --git a/internal/processing/fedi/fedi.go b/internal/processing/fedi/fedi.go
index 935eebd4d..92a23a543 100644
--- a/internal/processing/fedi/fedi.go
+++ b/internal/processing/fedi/fedi.go
@@ -28,15 +28,15 @@ type Processor struct {
 	state     *state.State
 	federator federation.Federator
 	tc        typeutils.TypeConverter
-	filter    visibility.Filter
+	filter    *visibility.Filter
 }
 
 // New returns a new fedi processor.
-func New(state *state.State, tc typeutils.TypeConverter, federator federation.Federator) Processor {
+func New(state *state.State, tc typeutils.TypeConverter, federator federation.Federator, filter *visibility.Filter) Processor {
 	return Processor{
 		state:     state,
 		federator: federator,
 		tc:        tc,
-		filter:    visibility.NewFilter(state.DB),
+		filter:    filter,
 	}
 }
diff --git a/internal/processing/fedi/status.go b/internal/processing/fedi/status.go
index 2595bef7f..072ff6aaf 100644
--- a/internal/processing/fedi/status.go
+++ b/internal/processing/fedi/status.go
@@ -44,7 +44,7 @@ func (p *Processor) StatusGet(ctx context.Context, requestedUsername string, req
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("status with id %s does not belong to account with id %s", status.ID, requestedAccount.ID))
 	}
 
-	visible, err := p.filter.StatusVisible(ctx, status, requestingAccount)
+	visible, err := p.filter.StatusVisible(ctx, requestingAccount, status)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -82,7 +82,7 @@ func (p *Processor) StatusRepliesGet(ctx context.Context, requestedUsername stri
 		return nil, gtserror.NewErrorNotFound(fmt.Errorf("status with id %s does not belong to account with id %s", status.ID, requestedAccount.ID))
 	}
 
-	visible, err := p.filter.StatusVisible(ctx, status, requestingAccount)
+	visible, err := p.filter.StatusVisible(ctx, requestedAccount, status)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -143,13 +143,13 @@ func (p *Processor) StatusRepliesGet(ctx context.Context, requestedUsername stri
 			}
 
 			// only show replies that the status owner can see
-			visibleToStatusOwner, err := p.filter.StatusVisible(ctx, r, requestedAccount)
+			visibleToStatusOwner, err := p.filter.StatusVisible(ctx, requestedAccount, r)
 			if err != nil || !visibleToStatusOwner {
 				continue
 			}
 
 			// only show replies that the requester can see
-			visibleToRequester, err := p.filter.StatusVisible(ctx, r, requestingAccount)
+			visibleToRequester, err := p.filter.StatusVisible(ctx, requestingAccount, r)
 			if err != nil || !visibleToRequester {
 				continue
 			}
diff --git a/internal/processing/fedi/user.go b/internal/processing/fedi/user.go
index 62518ad6f..3343ae8bc 100644
--- a/internal/processing/fedi/user.go
+++ b/internal/processing/fedi/user.go
@@ -62,7 +62,7 @@ func (p *Processor) UserGet(ctx context.Context, requestedUsername string, reque
 				return nil, gtserror.NewErrorUnauthorized(err)
 			}
 
-			blocked, err := p.state.DB.IsBlocked(ctx, requestedAccount.ID, requestingAccount.ID, true)
+			blocked, err := p.state.DB.IsEitherBlocked(ctx, requestedAccount.ID, requestingAccount.ID)
 			if err != nil {
 				return nil, gtserror.NewErrorInternalError(err)
 			}