diff options
Diffstat (limited to 'internal/processing/workers')
| -rw-r--r-- | internal/processing/workers/fromclientapi_test.go | 3 | ||||
| -rw-r--r-- | internal/processing/workers/surfacenotify.go | 2 | ||||
| -rw-r--r-- | internal/processing/workers/surfacetimeline.go | 12 |
3 files changed, 8 insertions, 9 deletions
diff --git a/internal/processing/workers/fromclientapi_test.go b/internal/processing/workers/fromclientapi_test.go index 3f6964259..1c30c11be 100644 --- a/internal/processing/workers/fromclientapi_test.go +++ b/internal/processing/workers/fromclientapi_test.go @@ -27,7 +27,6 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/ap" "code.superseriousbusiness.org/gotosocial/internal/config" "code.superseriousbusiness.org/gotosocial/internal/db" - statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "code.superseriousbusiness.org/gotosocial/internal/id" "code.superseriousbusiness.org/gotosocial/internal/messages" @@ -213,7 +212,7 @@ func (suite *FromClientAPITestSuite) statusJSON( ctx, status, requestingAccount, - statusfilter.FilterContextNone, + gtsmodel.FilterContextNone, nil, ) if err != nil { diff --git a/internal/processing/workers/surfacenotify.go b/internal/processing/workers/surfacenotify.go index 044315349..b11fb103e 100644 --- a/internal/processing/workers/surfacenotify.go +++ b/internal/processing/workers/surfacenotify.go @@ -743,7 +743,7 @@ func (s *Surface) Notify( } } - filters, err := s.State.DB.GetFiltersForAccountID(ctx, targetAccount.ID) + filters, err := s.State.DB.GetFiltersByAccountID(ctx, targetAccount.ID) if err != nil { return gtserror.Newf("couldn't retrieve filters for account %s: %w", targetAccount.ID, err) } diff --git a/internal/processing/workers/surfacetimeline.go b/internal/processing/workers/surfacetimeline.go index 7ef5fee87..7f9bcd596 100644 --- a/internal/processing/workers/surfacetimeline.go +++ b/internal/processing/workers/surfacetimeline.go @@ -180,7 +180,7 @@ func (s *Surface) timelineAndNotifyStatusForFollowers( follow.Account, status, stream.TimelineHome, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ); homeTimelined { @@ -275,7 +275,7 @@ func (s *Surface) listTimelineStatusForFollow( follow.Account, status, stream.TimelineList+":"+list.ID, // key streamType to this specific list - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) @@ -288,7 +288,7 @@ func (s *Surface) listTimelineStatusForFollow( // getFiltersAndMutes returns an account's filters and mutes. func (s *Surface) getFilters(ctx context.Context, accountID string) ([]*gtsmodel.Filter, error) { - filters, err := s.State.DB.GetFiltersForAccountID(ctx, accountID) + filters, err := s.State.DB.GetFiltersByAccountID(ctx, accountID) if err != nil { return nil, gtserror.Newf("couldn't retrieve filters for account %s: %w", accountID, err) } @@ -369,7 +369,7 @@ func (s *Surface) timelineStatus( account *gtsmodel.Account, status *gtsmodel.Status, streamType string, - filterCtx statusfilter.FilterContext, + filterCtx gtsmodel.FilterContext, filters []*gtsmodel.Filter, ) bool { @@ -436,7 +436,7 @@ func (s *Surface) timelineAndNotifyStatusForTagFollowers( tagFollowerAccount, status, stream.TimelineHome, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) } @@ -731,7 +731,7 @@ func (s *Surface) timelineStreamStatusUpdate( apiStatus, err := s.Converter.StatusToAPIStatus(ctx, status, account, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) |