mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 06:32:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] improved mute checking for boosted statuses (#4276)

Browse source 
This unwraps and follows the boosted status to do a full mute check on the original.

Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4276
Reviewed-by: tobi <kipvandenbos@noreply.codeberg.org>
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2025-06-16 13:12:48 +02:00 • committed by kim
commit b1c0eca1d8
1 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

58
internal/filter/mutes/status.go
View file

@ -232,6 +232,44 @@ func (f *Filter) getStatusRelatedUserMutes(
return nil, nil return nil, nil
} }
// Preallocate a slice of worst possible case no. user mutes.
mutes := make([]*gtsmodel.UserMute, 0, 2+len(status.Mentions))
// Check if status is boost.
if status.BoostOfID != "" {
if status.BoostOf == nil {
var err error
// Ensure original status is loaded on boost.
status.BoostOf, err = f.state.DB.GetStatusByID(
gtscontext.SetBarebones(ctx),
status.BoostOfID,
)
if err != nil {
return nil, gtserror.Newf("error getting boosted status of %s: %w", status.URI, err)
}
}
// Look for mute against booster.
mute, err := f.state.DB.GetMute(
gtscontext.SetBarebones(ctx),
requester.ID,
status.AccountID,
)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, gtserror.Newf("db error getting status author mute: %w", err)
}
if mute != nil {
// Append author mute to total.
mutes = append(mutes, mute)
}
// From here look at details
// for original boosted status.
status = status.BoostOf
}
if !status.MentionsPopulated() { if !status.MentionsPopulated() {
var err error var err error
@ -242,9 +280,6 @@ func (f *Filter) getStatusRelatedUserMutes(
} }
} }
// Preallocate a slice of worst possible case no. user mutes.
mutes := make([]*gtsmodel.UserMute, 0, 2+len(status.Mentions))
// Look for mute against author. // Look for mute against author.
mute, err := f.state.DB.GetMute( mute, err := f.state.DB.GetMute(
gtscontext.SetBarebones(ctx), gtscontext.SetBarebones(ctx),
@ -260,23 +295,6 @@ func (f *Filter) getStatusRelatedUserMutes(
mutes = append(mutes, mute) mutes = append(mutes, mute)
} }
if status.BoostOfAccountID != "" {
// Look for mute against boost author.
mute, err := f.state.DB.GetMute(
gtscontext.SetBarebones(ctx),
requester.ID,
status.AccountID,
)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, gtserror.Newf("db error getting boost author mute: %w", err)
}
if mute != nil {
// Append author mute to total.
mutes = append(mutes, mute)
}
}
for _, mention := range status.Mentions { for _, mention := range status.Mentions {
// Look for mute against any target mentions. // Look for mute against any target mentions.
if mention.TargetAccountID != requester.ID { if mention.TargetAccountID != requester.ID {