Skip to content

Commit fc65d6f

Browse files
authored
Change domain block behaviour to prevent creation of accounts from suspended domains (mastodon#11219)
1 parent 3e269fd commit fc65d6f

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

app/services/activitypub/process_account_service.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ def call(username, domain, json, options = {})
1515
@domain = domain
1616
@collections = {}
1717

18+
return if auto_suspend?
19+
1820
RedisLock.acquire(lock_options) do |lock|
1921
if lock.acquired?
2022
@account = Account.find_remote(@username, @domain)
@@ -55,7 +57,7 @@ def create_account
5557
@account.domain = @domain
5658
@account.private_key = nil
5759
@account.suspended_at = domain_block.created_at if auto_suspend?
58-
@account.silenced_at = domain_block.created_at if auto_silence?
60+
@account.silenced_at = domain_block.created_at if auto_silence?
5961
end
6062

6163
def update_account

app/services/resolve_account_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def call(uri, options = {})
4848
return
4949
end
5050

51-
return if links_missing?
51+
return if links_missing? || auto_suspend?
5252
return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
5353

5454
RedisLock.acquire(lock_options) do |lock|

0 commit comments

Comments
 (0)