1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00

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

This commit is contained in:
Thibaut Girka 2019-05-01 12:04:33 +02:00
parent 30296f1bb0
commit a015c65d2d

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