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/account/account.go   | 6 +++---
 internal/processing/account/bookmarks.go | 2 +-
 internal/processing/account/lists.go     | 2 +-
 internal/processing/account/statuses.go  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'internal/processing/account')

diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go
index 65bb40292..d65d7360c 100644
--- a/internal/processing/account/account.go
+++ b/internal/processing/account/account.go
@@ -38,7 +38,7 @@ type Processor struct {
 	state        *state.State
 	converter    *typeutils.Converter
 	mediaManager *media.Manager
-	filter       *visibility.Filter
+	visFilter    *visibility.Filter
 	formatter    *text.Formatter
 	federator    *federation.Federator
 	parseMention gtsmodel.ParseMentionFunc
@@ -52,7 +52,7 @@ func New(
 	converter *typeutils.Converter,
 	mediaManager *media.Manager,
 	federator *federation.Federator,
-	filter *visibility.Filter,
+	visFilter *visibility.Filter,
 	parseMention gtsmodel.ParseMentionFunc,
 ) Processor {
 	return Processor{
@@ -60,7 +60,7 @@ func New(
 		state:        state,
 		converter:    converter,
 		mediaManager: mediaManager,
-		filter:       filter,
+		visFilter:    visFilter,
 		formatter:    text.NewFormatter(state.DB),
 		federator:    federator,
 		parseMention: parseMention,
diff --git a/internal/processing/account/bookmarks.go b/internal/processing/account/bookmarks.go
index b9ecf0217..d64108d3a 100644
--- a/internal/processing/account/bookmarks.go
+++ b/internal/processing/account/bookmarks.go
@@ -64,7 +64,7 @@ func (p *Processor) BookmarksGet(ctx context.Context, requestingAccount *gtsmode
 			return nil, gtserror.NewErrorInternalError(err) // A real error has occurred.
 		}
 
-		visible, err := p.filter.StatusVisible(ctx, requestingAccount, status)
+		visible, err := p.visFilter.StatusVisible(ctx, requestingAccount, status)
 		if err != nil {
 			log.Errorf(ctx, "error checking bookmarked status visibility: %s", err)
 			continue
diff --git a/internal/processing/account/lists.go b/internal/processing/account/lists.go
index 12fbb884b..1d92bee82 100644
--- a/internal/processing/account/lists.go
+++ b/internal/processing/account/lists.go
@@ -42,7 +42,7 @@ func (p *Processor) ListsGet(ctx context.Context, requestingAccount *gtsmodel.Ac
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %w", err))
 	}
 
-	visible, err := p.filter.AccountVisible(ctx, requestingAccount, targetAccount)
+	visible, err := p.visFilter.AccountVisible(ctx, requestingAccount, targetAccount)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error: %w", err))
 	}
diff --git a/internal/processing/account/statuses.go b/internal/processing/account/statuses.go
index 593c30e27..2bab812e3 100644
--- a/internal/processing/account/statuses.go
+++ b/internal/processing/account/statuses.go
@@ -92,7 +92,7 @@ func (p *Processor) StatusesGet(
 
 	// Filtering + serialization process is the same for
 	// both pinned status queries and 'normal' ones.
-	filtered, err := p.filter.StatusesVisible(ctx, requestingAccount, statuses)
+	filtered, err := p.visFilter.StatusesVisible(ctx, requestingAccount, statuses)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
-- 
cgit v1.2.3