about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-10-31 00:43:34 +0100
committerGitHub <noreply@github.com>2018-10-31 00:43:34 +0100
commitce2ee68b64c2ba2baa10378027efd0aadbe98598 (patch)
tree36dd589709a9356330eb72af27600bdbe7d35812 /app/services
parent50ce347ef96690767b21ee01d6a785166c583b6b (diff)
Revert "Fix FetchAtomService content type handling (#9132)" (#9171)
This reverts commit c36a4a16178441968715e13c77859b1eb813c2af.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/fetch_atom_service.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index b6c6cdd1c..550e75f33 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -29,7 +29,7 @@ class FetchAtomService < BaseService
 
   def perform_request(&block)
     accept = 'text/html'
-    accept = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", application/atom+xml, ' + accept unless @unsupported_activity
+    accept = 'application/activity+json, application/ld+json, application/atom+xml, ' + accept unless @unsupported_activity
 
     Request.new(:get, @url).add_headers('Accept' => accept).perform(&block)
   end
@@ -37,11 +37,9 @@ class FetchAtomService < BaseService
   def process_response(response, terminal = false)
     return nil if response.code != 200
 
-    response_type = response.headers['Content-type']
-
-    if response_type == 'application/atom+xml'
+    if response.mime_type == 'application/atom+xml'
       [@url, { prefetched_body: response.body_with_limit }, :ostatus]
-    elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(response_type)
+    elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(response.mime_type)
       body = response.body_with_limit
       json = body_to_json(body)
       if supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && json['inbox'].present?
@@ -57,7 +55,7 @@ class FetchAtomService < BaseService
 
       if link_header&.find_link(%w(rel alternate))
         process_link_headers(link_header)
-      elsif response_type == 'text/html'
+      elsif response.mime_type == 'text/html'
         process_html(response)
       end
     end