OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Also unblock users who were suspended/silenced before dates were recorded

pull/10660/head
Thibaut Girka 2019-05-01 12:04:33 +02:00
parent 30296f1bb0
commit a015c65d2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/unblock_domain_service.rb
View File

@ -16,9 +16,9 @@ class UnblockDomainService < BaseService
def blocked_accounts
scope = Account.where(domain: domain_block.domain)
if domain_block.silence?
scope.where(silenced_at: @domain_block.created_at)
scope.where(silenced_at: [@domain_block.created_at, nil])
else
scope.where(suspended_at: @domain_block.created_at)
scope.where(suspended_at: [@domain_block.created_at, nil])
end
end