mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-25 14:05:11 +01:00
14f6ce2885
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d
.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
33 lines
753 B
Ruby
33 lines
753 B
Ruby
# frozen_string_literal: true
|
|
|
|
class UnblockDomainService < BaseService
|
|
attr_accessor :domain_block
|
|
|
|
def call(domain_block)
|
|
@domain_block = domain_block
|
|
process_retroactive_updates
|
|
domain_block.destroy
|
|
end
|
|
|
|
def process_retroactive_updates
|
|
blocked_accounts.in_batches.update_all(update_options) unless domain_block.noop?
|
|
end
|
|
|
|
def blocked_accounts
|
|
scope = Account.where(domain: domain_block.domain)
|
|
if domain_block.silence?
|
|
scope.where(silenced_at: @domain_block.created_at)
|
|
else
|
|
scope.where(suspended_at: @domain_block.created_at)
|
|
end
|
|
end
|
|
|
|
def update_options
|
|
{ domain_block_impact => nil }
|
|
end
|
|
|
|
def domain_block_impact
|
|
domain_block.silence? ? :silenced_at : :suspended_at
|
|
end
|
|
end
|