mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Change domain block behaviour to prevent creation of accounts from suspended domains (#11219)
This commit is contained in:
parent
13f54f41ad
commit
2cfa427ea7
@ -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)
|
||||
|
@ -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 New Issue
Block a user