Change domain block behaviour to prevent creation of accounts from suspended domains (#11219)
This commit is contained in:
parent
13f54f41ad
commit
2cfa427ea7
2 changed files with 4 additions and 2 deletions
|
@ -15,6 +15,8 @@ class ActivityPub::ProcessAccountService < BaseService
|
|||
@domain = domain
|
||||
@collections = {}
|
||||
|
||||
return if auto_suspend?
|
||||
|
||||
RedisLock.acquire(lock_options) do |lock|
|
||||
if lock.acquired?
|
||||
@account = Account.find_remote(@username, @domain)
|
||||
|
@ -55,7 +57,7 @@ class ActivityPub::ProcessAccountService < BaseService
|
|||
@account.domain = @domain
|
||||
@account.private_key = nil
|
||||
@account.suspended_at = domain_block.created_at if auto_suspend?
|
||||
@account.silenced_at = domain_block.created_at if auto_silence?
|
||||
@account.silenced_at = domain_block.created_at if auto_silence?
|
||||
end
|
||||
|
||||
def update_account
|
||||
|
|
|
@ -48,7 +48,7 @@ class ResolveAccountService < BaseService
|
|||
return
|
||||
end
|
||||
|
||||
return if links_missing?
|
||||
return if links_missing? || auto_suspend?
|
||||
return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
|
||||
|
||||
RedisLock.acquire(lock_options) do |lock|
|
||||
|
|
Loading…
Reference in a new issue