about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2017-10-05 00:21:44 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-10-05 00:21:44 +0200
commit2559d9166cea24fceb9b72ca112804811d87a4a8 (patch)
tree7f77e9693bf2a0fe308ef1223f014b26a7d8c11b /app
parent32e8a87830f2b054f2a32ded4c41d91003503d14 (diff)
Fix regression in FetchRemoteResourceService (#5217)
* Fix regression in FetchRemoteResourceService

* Update specs to match interface changes made in #5114
Diffstat (limited to 'app')
-rw-r--r--app/services/fetch_atom_service.rb2
-rw-r--r--app/services/fetch_remote_resource_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index 7c54714a2..1c47a22da 100644
--- 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
diff --git a/app/services/fetch_remote_resource_service.rb b/app/services/fetch_remote_resource_service.rb
index 341664272..6d40796f2 100644
--- 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