From c9b6220fef01dce80a31436660cd06b4e1db030f Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 24 Jul 2024 13:27:42 +0200
Subject: [chore] Add interaction filter to complement existing visibility
 filter (#3111)

* [chore] Add interaction filter to complement existing visibility filter

* pass in ptr to visibility and interaction filters to Processor{} to ensure shared

* use int constants for for match type, cache db calls in filterctx

* function name typo :innocent:

---------

Co-authored-by: kim <grufwub@gmail.com>
---
 internal/processing/common/account.go | 4 ++--
 internal/processing/common/common.go  | 6 +++---
 internal/processing/common/status.go  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'internal/processing/common')

diff --git a/internal/processing/common/account.go b/internal/processing/common/account.go
index c0daf647d..05e974513 100644
--- a/internal/processing/common/account.go
+++ b/internal/processing/common/account.go
@@ -55,7 +55,7 @@ func (p *Processor) GetTargetAccountBy(
 	}
 
 	// Check whether target account is visible to requesting account.
-	visible, err = p.filter.AccountVisible(ctx, requester, target)
+	visible, err = p.visFilter.AccountVisible(ctx, requester, target)
 	if err != nil {
 		return nil, false, gtserror.NewErrorInternalError(err)
 	}
@@ -241,7 +241,7 @@ func (p *Processor) getVisibleAPIAccounts(
 		}
 
 		// Check whether this account is visible to requesting account.
-		visible, err := p.filter.AccountVisible(ctx, requester, account)
+		visible, err := p.visFilter.AccountVisible(ctx, requester, account)
 		if err != nil {
 			l.Errorf("error checking account visibility: %v", err)
 			continue
diff --git a/internal/processing/common/common.go b/internal/processing/common/common.go
index 942cecc59..29def3506 100644
--- a/internal/processing/common/common.go
+++ b/internal/processing/common/common.go
@@ -33,7 +33,7 @@ type Processor struct {
 	media     *media.Manager
 	converter *typeutils.Converter
 	federator *federation.Federator
-	filter    *visibility.Filter
+	visFilter *visibility.Filter
 }
 
 // New returns a new Processor instance.
@@ -42,13 +42,13 @@ func New(
 	media *media.Manager,
 	converter *typeutils.Converter,
 	federator *federation.Federator,
-	filter *visibility.Filter,
+	visFilter *visibility.Filter,
 ) Processor {
 	return Processor{
 		state:     state,
 		media:     media,
 		converter: converter,
 		federator: federator,
-		filter:    filter,
+		visFilter: visFilter,
 	}
 }
diff --git a/internal/processing/common/status.go b/internal/processing/common/status.go
index cce1967b9..3ef643292 100644
--- a/internal/processing/common/status.go
+++ b/internal/processing/common/status.go
@@ -63,7 +63,7 @@ func (p *Processor) GetTargetStatusBy(
 	}
 
 	// Check whether target status is visible to requesting account.
-	visible, err = p.filter.StatusVisible(ctx, requester, target)
+	visible, err = p.visFilter.StatusVisible(ctx, requester, target)
 	if err != nil {
 		return nil, false, gtserror.NewErrorInternalError(err)
 	}
-- 
cgit v1.2.3