diff options
author | ThibG <thib@sitedethib.com> | 2019-05-15 18:44:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-15 18:44:21 +0200 |
commit | c1cf8c1636e0a639cced585f0cb234547a64d417 (patch) | |
tree | 77b40e8bb0b1682bebaebebfa32d135ba406ac14 /app/services/unblock_domain_service.rb | |
parent | 4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (diff) | |
parent | 6badf2d252a980d496b894c7258a778c57639953 (diff) |
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/unblock_domain_service.rb')
-rw-r--r-- | app/services/unblock_domain_service.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb index 946b6d465..9b8526fbe 100644 --- a/app/services/unblock_domain_service.rb +++ b/app/services/unblock_domain_service.rb @@ -3,9 +3,9 @@ class UnblockDomainService < BaseService attr_accessor :domain_block - def call(domain_block, retroactive) + def call(domain_block) @domain_block = domain_block - process_retroactive_updates if retroactive + process_retroactive_updates domain_block.destroy end @@ -14,14 +14,19 @@ class UnblockDomainService < BaseService end def blocked_accounts - Account.where(domain: domain_block.domain) + 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 => false } + { domain_block_impact => nil } end def domain_block_impact - domain_block.silence? ? :silenced : :suspended + domain_block.silence? ? :silenced_at : :suspended_at end end |