Change account suspensions to be federated to recently-followed accounts as well (#34294)

This commit is contained in:
Claire 2025-03-28 10:20:32 +01:00 committed by GitHub
parent 0479efdbb6
commit c2defe0e4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 3 deletions

View file

@ -10,7 +10,7 @@ class AccountReachFinder
end
def inboxes
(followers_inboxes + reporters_inboxes + recently_mentioned_inboxes + relay_inboxes).uniq
(followers_inboxes + reporters_inboxes + recently_mentioned_inboxes + recently_followed_inboxes + recently_requested_inboxes + relay_inboxes).uniq
end
private
@ -31,16 +31,31 @@ class AccountReachFinder
.take(RECENT_LIMIT)
end
def recently_followed_inboxes
@account
.following
.where(follows: { created_at: recent_date_cutoff... })
.inboxes
.take(RECENT_LIMIT)
end
def recently_requested_inboxes
Account
.where(id: @account.follow_requests.where({ created_at: recent_date_cutoff... }).select(:target_account_id))
.inboxes
.take(RECENT_LIMIT)
end
def relay_inboxes
Relay.enabled.pluck(:inbox_url)
end
def oldest_status_id
Mastodon::Snowflake
.id_at(oldest_status_date, with_random: false)
.id_at(recent_date_cutoff, with_random: false)
end
def oldest_status_date
def recent_date_cutoff
@account.suspended? && @account.suspension_origin_local? ? @account.suspended_at - STATUS_SINCE : STATUS_SINCE.ago
end