Improve account suspension speed and completeness (#9290)
- Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern
This commit is contained in:
parent
2df5ef18ae
commit
6ddf0432e7
6 changed files with 153 additions and 76 deletions
|
@ -9,7 +9,9 @@ class BatchedRemoveStatusService < BaseService
|
|||
# Remove statuses from home feeds
|
||||
# Push delete events to streaming API for home feeds and public feeds
|
||||
# @param [Status] statuses A preferably batched array of statuses
|
||||
def call(statuses)
|
||||
# @param [Hash] options
|
||||
# @option [Boolean] :skip_side_effects
|
||||
def call(statuses, **options)
|
||||
statuses = Status.where(id: statuses.map(&:id)).includes(:account, :stream_entry).flat_map { |status| [status] + status.reblogs.includes(:account, :stream_entry).to_a }
|
||||
|
||||
@mentions = statuses.each_with_object({}) { |s, h| h[s.id] = s.active_mentions.includes(:account).to_a }
|
||||
|
@ -26,6 +28,8 @@ class BatchedRemoveStatusService < BaseService
|
|||
status.destroy
|
||||
end
|
||||
|
||||
return if options[:skip_side_effects]
|
||||
|
||||
# Batch by source account
|
||||
statuses.group_by(&:account_id).each_value do |account_statuses|
|
||||
account = account_statuses.first.account
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue