gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-29 02:50:46 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix blocked accounts not being automatically removed from trending statuses (#34891)

Browse Source
This commit is contained in:
Claire 2025-06-02 15:38:47 +02:00
parent 4632be68eb
commit 980c336ca4
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/trends/statuses.rb
View File

@ -106,7 +106,15 @@ class Trends::Statuses < Trends::Base
private
def eligible?(status)
status.created_at.past? && status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
status.created_at.past? &&
status.public_visibility? &&
status.account.discoverable? &&
!status.account.silenced? &&
!status.account.sensitized? &&
status.spoiler_text.blank? &&
!status.sensitive? &&
!status.reply? &&
valid_locale?(status.language)
end
def calculate_scores(statuses, at_time)

5
app/services/suspend_account_service.rb
View File

@ -15,6 +15,7 @@ class SuspendAccountService < BaseService
unmerge_from_home_timelines!
unmerge_from_list_timelines!
privatize_media_attachments!
remove_from_trends!
end
private
@ -101,6 +102,10 @@ class SuspendAccountService < BaseService
end
end
def remove_from_trends!
StatusTrend.where(account: @account).delete_all
end
def signed_activity_json
@signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account))
end