diff options
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 5 | ||||
| -rw-r--r-- | internal/typeutils/internaltofrontend_test.go | 38 |
2 files changed, 41 insertions, 2 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index d9c8748f5..d5c7cb0b1 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -943,8 +943,9 @@ func (c *Converter) statusToAPIFilterResults( // Both mutes and filters can expire. now := time.Now() - // If the requesting account mutes the account that created this status, hide the status. - if mutes.Matches(s.AccountID, filterContext, now) { + // If requesting account mutes the author (taking boosts into account), hide it. + if (s.BoostOfAccountID != "" && mutes.Matches(s.AccountID, filterContext, now)) || + mutes.Matches(s.AccountID, filterContext, now) { return nil, statusfilter.ErrHideStatus } diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go index 1ca0840a5..df6edd553 100644 --- a/internal/typeutils/internaltofrontend_test.go +++ b/internal/typeutils/internaltofrontend_test.go @@ -1161,6 +1161,7 @@ func (suite *InternalToFrontendTestSuite) TestHashtagAnywhereFilteredBoostToFron func (suite *InternalToFrontendTestSuite) TestMutedStatusToFrontend() { testStatus := suite.testStatuses["admin_account_status_1"] requestingAccount := suite.testAccounts["local_account_1"] + mutes := usermute.NewCompiledUserMuteList([]*gtsmodel.UserMute{ { AccountID: requestingAccount.ID, @@ -1168,6 +1169,7 @@ func (suite *InternalToFrontendTestSuite) TestMutedStatusToFrontend() { Notifications: util.Ptr(false), }, }) + _, err := suite.typeconverter.StatusToAPIStatus( context.Background(), testStatus, @@ -1186,6 +1188,7 @@ func (suite *InternalToFrontendTestSuite) TestMutedReplyStatusToFrontend() { testStatus.InReplyToID = suite.testStatuses["local_account_2_status_1"].ID testStatus.InReplyToAccountID = mutedAccount.ID requestingAccount := suite.testAccounts["local_account_1"] + mutes := usermute.NewCompiledUserMuteList([]*gtsmodel.UserMute{ { AccountID: requestingAccount.ID, @@ -1193,11 +1196,46 @@ func (suite *InternalToFrontendTestSuite) TestMutedReplyStatusToFrontend() { Notifications: util.Ptr(false), }, }) + // Populate status so the converter has the account objects it needs for muting. err := suite.db.PopulateStatus(context.Background(), testStatus) if err != nil { suite.FailNow(err.Error()) } + + // Convert the status to API format, which should fail. + _, err = suite.typeconverter.StatusToAPIStatus( + context.Background(), + testStatus, + requestingAccount, + statusfilter.FilterContextHome, + nil, + mutes, + ) + suite.ErrorIs(err, statusfilter.ErrHideStatus) +} + +func (suite *InternalToFrontendTestSuite) TestMutedBoostStatusToFrontend() { + mutedAccount := suite.testAccounts["local_account_2"] + testStatus := suite.testStatuses["admin_account_status_1"] + testStatus.BoostOfID = suite.testStatuses["local_account_2_status_1"].ID + testStatus.BoostOfAccountID = mutedAccount.ID + requestingAccount := suite.testAccounts["local_account_1"] + + mutes := usermute.NewCompiledUserMuteList([]*gtsmodel.UserMute{ + { + AccountID: requestingAccount.ID, + TargetAccountID: mutedAccount.ID, + Notifications: util.Ptr(false), + }, + }) + + // Populate status so the converter has the account objects it needs for muting. + err := suite.db.PopulateStatus(context.Background(), testStatus) + if err != nil { + suite.FailNow(err.Error()) + } + // Convert the status to API format, which should fail. _, err = suite.typeconverter.StatusToAPIStatus( context.Background(), |