Fix regression in FetchRemoteResourceService (#5217)

* Fix regression in FetchRemoteResourceService * Update specs to match interface changes made in #5114
2017-10-05 00:21:44 +02:00
parent 32e8a87830
commit 2559d9166c
3 changed files with 4 additions and 4 deletions
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -45,7 +45,7 @@ class FetchAtomService < BaseService
    elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(@response.mime_type)
      json = body_to_json(@response.to_s)
      if supported_context?(json) && json['type'] == 'Person' && json['inbox'].present?
-        [json['id'], { id: true }, :activitypub]
+        [json['id'], { prefetched_body: @response.to_s, id: true }, :activitypub]
      else
        @unsupported_activity = true
        nil
--- a/app/services/fetch_remote_resource_service.rb
+++ b/app/services/fetch_remote_resource_service.rb
@@ -33,7 +33,7 @@ class FetchRemoteResourceService < BaseService
  end

  def body
-    fetched_atom_feed.second
+    fetched_atom_feed.second[:prefetched_body]
  end

  def protocol