diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-25 20:53:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 20:53:57 -0700 |
| commit | 3d890c407356c8e0e7dd9b64e8e232ededcff8e8 (patch) | |
| tree | a22df9a8737250f97a6024943af3445a163917b3 /app/services/follow_remote_account_service.rb | |
| parent | febe2449bb14f3d877fb934ceb6d52e320712bac (diff) | |
| parent | 905c82917959a5afe24cb85c62c0b0ba13f0da8b (diff) | |
Merge pull request #3 from tootsuite/master
Updating to current
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 f640222b0..b39eafc70 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -14,7 +14,6 @@ class FollowRemoteAccountService < BaseService username, domain = uri.split('@') return Account.find_local(username) if TagManager.instance.local_domain?(domain) - return nil if DomainBlock.blocked?(domain) account = Account.find_remote(username, domain) return account unless account.nil? @@ -36,11 +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 domain_block && domain_block.suspend? + account.silenced = true if domain_block && domain_block.silence? xml = get_feed(account.remote_url) hubs = get_hubs(xml) |