2 files changed, 25 insertions, 17 deletions
diff --git a/internal/processing/common/common.go b/internal/processing/common/common.go
index 9f4753147..bebbdffea 100644
--- a/internal/processing/common/common.go
+++ b/internal/processing/common/common.go
@@ -19,6 +19,7 @@ package common
 
 import (
 	"code.superseriousbusiness.org/gotosocial/internal/federation"
+	"code.superseriousbusiness.org/gotosocial/internal/filter/mutes"
 	"code.superseriousbusiness.org/gotosocial/internal/filter/visibility"
 	"code.superseriousbusiness.org/gotosocial/internal/media"
 	"code.superseriousbusiness.org/gotosocial/internal/state"
@@ -29,11 +30,12 @@ import (
 // common to multiple logical domains of the
 // processing subsection of the codebase.
 type Processor struct {
-	state     *state.State
-	media     *media.Manager
-	converter *typeutils.Converter
-	federator *federation.Federator
-	visFilter *visibility.Filter
+	state      *state.State
+	media      *media.Manager
+	converter  *typeutils.Converter
+	federator  *federation.Federator
+	visFilter  *visibility.Filter
+	muteFilter *mutes.Filter
 }
 
 // New returns a new Processor instance.
@@ -43,12 +45,14 @@ func New(
 	converter *typeutils.Converter,
 	federator *federation.Federator,
 	visFilter *visibility.Filter,
+	muteFilter *mutes.Filter,
 ) Processor {
 	return Processor{
-		state:     state,
-		media:     media,
-		converter: converter,
-		federator: federator,
-		visFilter: visFilter,
+		state:      state,
+		media:      media,
+		converter:  converter,
+		federator:  federator,
+		visFilter:  visFilter,
+		muteFilter: muteFilter,
 	}
 }
diff --git a/internal/processing/common/status.go b/internal/processing/common/status.go
index 14245f88a..441a58384 100644
--- a/internal/processing/common/status.go
+++ b/internal/processing/common/status.go
@@ -25,7 +25,6 @@ import (
 	"code.superseriousbusiness.org/gotosocial/internal/db"
 	"code.superseriousbusiness.org/gotosocial/internal/federation/dereferencing"
 	statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status"
-	"code.superseriousbusiness.org/gotosocial/internal/filter/usermute"
 	"code.superseriousbusiness.org/gotosocial/internal/gtserror"
 	"code.superseriousbusiness.org/gotosocial/internal/gtsmodel"
 	"code.superseriousbusiness.org/gotosocial/internal/log"
@@ -216,7 +215,6 @@ func (p *Processor) GetAPIStatus(
 		requester,
 		statusfilter.FilterContextNone,
 		nil,
-		nil,
 	)
 	if err != nil {
 		err := gtserror.Newf("error converting: %w", err)
@@ -238,7 +236,6 @@ func (p *Processor) GetVisibleAPIStatuses(
 	statuses []*gtsmodel.Status,
 	filterContext statusfilter.FilterContext,
 	filters []*gtsmodel.Filter,
-	userMutes []*gtsmodel.UserMute,
 ) []apimodel.Status {
 
 	// Start new log entry with
@@ -247,9 +244,6 @@ func (p *Processor) GetVisibleAPIStatuses(
 	l := log.WithContext(ctx).
 		WithField("caller", log.Caller(3))
 
-	// Compile mutes to useable user mutes for type converter.
-	compUserMutes := usermute.NewCompiledUserMuteList(userMutes)
-
 	// Iterate filtered statuses for conversion to API model.
 	apiStatuses := make([]apimodel.Status, 0, len(statuses))
 	for _, status := range statuses {
@@ -268,13 +262,23 @@ func (p *Processor) GetVisibleAPIStatuses(
 			continue
 		}
 
+		// Check whether this status is muted by requesting account.
+		muted, err := p.muteFilter.StatusMuted(ctx, requester, status)
+		if err != nil {
+			log.Errorf(ctx, "error checking mute: %v", err)
+			continue
+		}
+
+		if muted {
+			continue
+		}
+
 		// Convert to API status, taking mute / filter into account.
 		apiStatus, err := p.converter.StatusToAPIStatus(ctx,
 			status,
 			requester,
 			filterContext,
 			filters,
-			compUserMutes,
 		)
 		if err != nil && !errors.Is(err, statusfilter.ErrHideStatus) {
 			l.Errorf("error converting: %v", err)