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 --- internal/processing/search/search.go | 6 +++--- internal/processing/search/util.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/processing/search') diff --git a/internal/processing/search/search.go b/internal/processing/search/search.go index 6c0ab2457..18008647c 100644 --- a/internal/processing/search/search.go +++ b/internal/processing/search/search.go @@ -28,15 +28,15 @@ type Processor struct { state *state.State federator *federation.Federator converter *typeutils.Converter - filter *visibility.Filter + visFilter *visibility.Filter } // New returns a new status processor. -func New(state *state.State, federator *federation.Federator, converter *typeutils.Converter, filter *visibility.Filter) Processor { +func New(state *state.State, federator *federation.Federator, converter *typeutils.Converter, visFilter *visibility.Filter) Processor { return Processor{ state: state, federator: federator, converter: converter, - filter: filter, + visFilter: visFilter, } } diff --git a/internal/processing/search/util.go b/internal/processing/search/util.go index 190289155..8043affd9 100644 --- a/internal/processing/search/util.go +++ b/internal/processing/search/util.go @@ -103,7 +103,7 @@ func (p *Processor) packageStatuses( for _, status := range statuses { // Ensure requester can see result status. - visible, err := p.filter.StatusVisible(ctx, requestingAccount, status) + visible, err := p.visFilter.StatusVisible(ctx, requestingAccount, status) if err != nil { err = gtserror.Newf("error checking visibility of status %s for account %s: %w", status.ID, requestingAccount.ID, err) return nil, gtserror.NewErrorInternalError(err) -- cgit v1.2.3