fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change domain block behaviour to prevent creation of accounts from suspended domains (#11219)

Browse source
This commit is contained in:
Eugen Rochko 2019-07-01 19:13:30 +02:00 committed by GitHub
parent 13f54f41ad
commit 2cfa427ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/activitypub/process_account_service.rb
View file

@ -15,6 +15,8 @@ class ActivityPub::ProcessAccountService < BaseService
@domain = domain @domain = domain
@collections = {} @collections = {}
return if auto_suspend?
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
if lock.acquired? if lock.acquired?
@account = Account.find_remote(@username, @domain) @account = Account.find_remote(@username, @domain)
@ -55,7 +57,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.domain = @domain @account.domain = @domain
@account.private_key = nil @account.private_key = nil
@account.suspended_at = domain_block.created_at if auto_suspend? @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 end
def update_account def update_account

2
app/services/resolve_account_service.rb
View file

@ -48,7 +48,7 @@ class ResolveAccountService < BaseService
return return
end end
return if links_missing? return if links_missing? || auto_suspend?
return Account.find_local(@username) if TagManager.instance.local_domain?(@domain) return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|