mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-10 01:25:15 +00:00
Also unblock users who were suspended/silenced before dates were recorded
This commit is contained in:
parent
30296f1bb0
commit
a015c65d2d
|
@ -16,9 +16,9 @@ class UnblockDomainService < BaseService
|
||||||
def blocked_accounts
|
def blocked_accounts
|
||||||
scope = Account.where(domain: domain_block.domain)
|
scope = Account.where(domain: domain_block.domain)
|
||||||
if domain_block.silence?
|
if domain_block.silence?
|
||||||
scope.where(silenced_at: @domain_block.created_at)
|
scope.where(silenced_at: [@domain_block.created_at, nil])
|
||||||
else
|
else
|
||||||
scope.where(suspended_at: @domain_block.created_at)
|
scope.where(suspended_at: [@domain_block.created_at, nil])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue