SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix] Move follow.show_reblogs check further up to avoid showing unwanted reblogs in home timeline (#2234)

This commit is contained in:
tobi 2023-09-29 10:39:35 +02:00 committed by GitHub
parent 2a9927dfdc
commit b6b8f82c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/processing/workers/surfacetimeline.go
View File

@ -91,9 +91,13 @@ func (s *surface) timelineAndNotifyStatusForFollowers(
)
for _, follow := range follows {
// Do an initial rough-grained check to see if the
// status is timelineable for this follower at all
// based on its visibility and who it replies to etc.
// Check to see if the status is timelineable for this follower,
// taking account of its visibility, who it replies to, and, if
// it's a reblog, whether follower account wants to see reblogs.
//
// If it's not timelineable, we can just stop early, since lists
// are prettymuch subsets of the home timeline, so if it shouldn't
// appear there, it shouldn't appear in lists either.
timelineable, err := s.filter.StatusHomeTimelineable(
ctx, follow.Account, status,
)
@ -107,17 +111,6 @@ func (s *surface) timelineAndNotifyStatusForFollowers(
continue
}
if boost && !*follow.ShowReblogs {
// Status is a boost, but the owner of
// this follow doesn't want to see boosts
// from this account. We can safely skip
// everything, then, because we also know
// that the follow owner won't want to be
// have the status put in any list timelines,
// or be notified about the status either.
continue
}
// Add status to any relevant lists
// for this follow, if applicable.
s.listTimelineStatusForFollow(

27
internal/visibility/home_timeline.go
View File

@ -19,10 +19,12 @@ package visibility
import (
"context"
"errors"
"fmt"
"time"
"github.com/superseriousbusiness/gotosocial/internal/cache"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@ -169,24 +171,23 @@ func (f *Filter) isStatusHomeTimelineable(ctx context.Context, owner *gtsmodel.A
// a status thread *including* the owner, or a conversation thread between
// accounts the timeline owner follows.
if status.Visibility == gtsmodel.VisibilityFollowersOnly ||
status.Visibility == gtsmodel.VisibilityMutualsOnly {
// Followers/mutuals only post that already passed the status
// visibility check, (i.e. we follow / mutuals with author).
return true, nil
}
// Ensure owner follows author of public/unlocked status.
follow, err := f.state.DB.IsFollowing(ctx,
// Ensure owner follows author.
follow, err := f.state.DB.GetFollow(ctx,
owner.ID,
status.AccountID,
)
if err != nil {
return false, gtserror.Newf("error checking follow %s->%s: %w", owner.ID, status.AccountID, err)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return false, gtserror.Newf("error retrieving follow %s->%s: %w", owner.ID, status.AccountID, err)
}
if !follow {
log.Trace(ctx, "ignoring visible status from unfollowed author")
if follow == nil {
log.Trace(ctx, "ignoring status from unfollowed author")
return false, nil
}
if status.BoostOfID != "" && !*follow.ShowReblogs {
// Status is a boost, but the owner of this follow
// doesn't want to see boosts from this account.
return false, nil
}

32
internal/visibility/home_timeline_test.go
View File

@ -55,6 +55,38 @@ func (suite *StatusStatusHomeTimelineableTestSuite) TestFollowingStatusHomeTimel
suite.True(timelineable)
}
func (suite *StatusStatusHomeTimelineableTestSuite) TestFollowingBoostedStatusHomeTimelineable() {
ctx := context.Background()
testStatus := suite.testStatuses["admin_account_status_4"]
testAccount := suite.testAccounts["local_account_1"]
timelineable, err := suite.filter.StatusHomeTimelineable(ctx, testAccount, testStatus)
suite.NoError(err)
suite.True(timelineable)
}
func (suite *StatusStatusHomeTimelineableTestSuite) TestFollowingBoostedStatusHomeTimelineableNoReblogs() {
ctx := context.Background()
// Update follow to indicate that local_account_1
// doesn't want to see reblogs by admin_account.
follow := &gtsmodel.Follow{}
*follow = *suite.testFollows["local_account_1_admin_account"]
follow.ShowReblogs = util.Ptr(false)
if err := suite.db.UpdateFollow(ctx, follow, "show_reblogs"); err != nil {
suite.FailNow(err.Error())
}
testStatus := suite.testStatuses["admin_account_status_4"]
testAccount := suite.testAccounts["local_account_1"]
timelineable, err := suite.filter.StatusHomeTimelineable(ctx, testAccount, testStatus)
suite.NoError(err)
suite.False(timelineable)
}
func (suite *StatusStatusHomeTimelineableTestSuite) TestNotFollowingStatusHomeTimelineable() {
testStatus := suite.testStatuses["remote_account_1_status_1"]
testAccount := suite.testAccounts["local_account_1"]