diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-27 14:42:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-27 14:42:22 +0200 |
commit | 88725d6ce85115ea3b0652007db5d40a1c069be3 (patch) | |
tree | 7a8965abda1cfc3b6c319ea19ee216755ac2f2df /app/services/follow_remote_account_service.rb | |
parent | be0a01145b5f303c5c506858146ccf6c6d5cee72 (diff) |
OEmbed support for PreviewCard (#2337)
* OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller
Diffstat (limited to 'app/services/follow_remote_account_service.rb')
-rw-r--r-- | app/services/follow_remote_account_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index fbf983093..0b5abf58a 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -2,6 +2,7 @@ class FollowRemoteAccountService < BaseService include OStatus2::MagicKey + include HttpHelper DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0' @@ -73,7 +74,7 @@ class FollowRemoteAccountService < BaseService end def get_feed(url) - response = http_client.get(Addressable::URI.parse(url).normalize) + response = http_client(write: 20, connect: 20, read: 50).get(Addressable::URI.parse(url).normalize) [response.to_s, Nokogiri::XML(response)] end @@ -98,8 +99,4 @@ class FollowRemoteAccountService < BaseService def get_profile(body, account) RemoteProfileUpdateWorker.perform_async(account.id, body.force_encoding('UTF-8'), false) end - - def http_client - HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50) - end end |