diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-26 16:42:38 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-26 16:44:40 +0200 |
commit | c6b0311b8626b42bc7e79e0195047a50e5b64dd1 (patch) | |
tree | e68f4b6922de5ec6277de7bc76b2bdb47a8c3e89 /app/services/fetch_remote_status_service.rb | |
parent | 0bd4608ad1b29328f04fcad6e7a20ef61668d239 (diff) |
Fix #54 - Fetch remote accounts by URL from mentions
Fetching atom extracted from FetchRemoteAccountService and FetchRemoteStatusService into FetchAtomService. Mentions of the constant "http://activityschema.org/collection/public" skipped as it's not a real URL/user.
Diffstat (limited to 'app/services/fetch_remote_status_service.rb')
-rw-r--r-- | app/services/fetch_remote_status_service.rb | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb index c872cb385..7613607b4 100644 --- a/app/services/fetch_remote_status_service.rb +++ b/app/services/fetch_remote_status_service.rb @@ -1,17 +1,9 @@ class FetchRemoteStatusService < BaseService def call(url) - response = http_client.head(url) + atom_url, body = FetchAtomService.new.(url) - Rails.logger.debug "Remote status HEAD request returned code #{response.code}" - return nil if response.code != 200 - - if response.mime_type == 'application/atom+xml' - return process_atom(url, fetch(url)) - elsif !response['Link'].blank? - return process_headers(response) - else - return process_html(fetch(url)) - end + return nil if atom_url.nil? + return process_atom(atom_url, body) end private @@ -29,26 +21,6 @@ class FetchRemoteStatusService < BaseService return statuses.first end - def process_html(body) - Rails.logger.debug "Processing HTML for remote status" - - page = Nokogiri::HTML(body) - alternate_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' } - - return nil if alternate_link.nil? - return process_atom(alternate_link['href'], fetch(alternate_link['href'])) - end - - def process_headers(response) - Rails.logger.debug "Processing link header for remote status" - - link_header = LinkHeader.parse(response['Link']) - alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml']) - - return nil if alternate_link.nil? - return process_atom(alternate_link.href, fetch(alternate_link.href)) - end - def extract_author(url, xml) url_parts = Addressable::URI.parse(url) username = xml.at_xpath('//xmlns:author/xmlns:name').try(:content) @@ -60,12 +32,4 @@ class FetchRemoteStatusService < BaseService return FollowRemoteAccountService.new.("#{username}@#{domain}") end - - def fetch(url) - http_client.get(url).to_s - end - - def http_client - HTTP.timeout(:per_operation, write: 20, connect: 20, read: 50) - end end |