diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 17:38:38 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 17:38:38 +0100 |
| commit | 6d98a731803eb37ff36f60ff004acfc4c27ae37b (patch) | |
| tree | 5ccc79cb65ccc6174aea1c5e0a8452b5076026d9 /app/services/follow_remote_account_service.rb | |
| parent | ef2b92467977758466f4f19acb3334bee1fde107 (diff) | |
Domain blocks now have varying severity - auto-suspend vs auto-silence
Diffstat (limited to 'app/services/follow_remote_account_service.rb')
| -rw-r--r-- | app/services/follow_remote_account_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index d17cf0f45..b39eafc70 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -35,12 +35,15 @@ class FollowRemoteAccountService < BaseService Rails.logger.debug "Creating new remote account for #{uri}" + domain_block = DomainBlock.find_by(domain: domain) + account.remote_url = data.link('http://schemas.google.com/g/2010#updates-from').href account.salmon_url = data.link('salmon').href account.url = data.link('http://webfinger.net/rel/profile-page').href account.public_key = magic_key_to_pem(data.link('magic-public-key').href) account.private_key = nil - account.suspended = true if DomainBlock.blocked?(domain) + account.suspended = true if domain_block && domain_block.suspend? + account.silenced = true if domain_block && domain_block.silence? xml = get_feed(account.remote_url) hubs = get_hubs(xml) |