diff options
| author | ThibG <thib@sitedethib.com> | 2017-10-05 00:21:44 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-05 00:21:44 +0200 |
| commit | 2559d9166cea24fceb9b72ca112804811d87a4a8 (patch) | |
| tree | 7f77e9693bf2a0fe308ef1223f014b26a7d8c11b | |
| parent | 32e8a87830f2b054f2a32ded4c41d91003503d14 (diff) | |
Fix regression in FetchRemoteResourceService (#5217)
* Fix regression in FetchRemoteResourceService * Update specs to match interface changes made in #5114
| -rw-r--r-- | app/services/fetch_atom_service.rb | 2 | ||||
| -rw-r--r-- | app/services/fetch_remote_resource_service.rb | 2 | ||||
| -rw-r--r-- | spec/services/fetch_remote_resource_service_spec.rb | 4 |
3 files changed, 4 insertions, 4 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 diff --git a/spec/services/fetch_remote_resource_service_spec.rb b/spec/services/fetch_remote_resource_service_spec.rb index c14fcfc4e..b80fb2475 100644 --- a/spec/services/fetch_remote_resource_service_spec.rb +++ b/spec/services/fetch_remote_resource_service_spec.rb @@ -22,7 +22,7 @@ describe FetchRemoteResourceService do allow(FetchAtomService).to receive(:new).and_return service feed_url = 'http://feed-url' feed_content = '<feed>contents</feed>' - allow(service).to receive(:call).with(url).and_return([feed_url, feed_content]) + allow(service).to receive(:call).with(url).and_return([feed_url, { prefetched_body: feed_content }]) account_service = double allow(FetchRemoteAccountService).to receive(:new).and_return(account_service) @@ -39,7 +39,7 @@ describe FetchRemoteResourceService do allow(FetchAtomService).to receive(:new).and_return service feed_url = 'http://feed-url' feed_content = '<entry>contents</entry>' - allow(service).to receive(:call).with(url).and_return([feed_url, feed_content]) + allow(service).to receive(:call).with(url).and_return([feed_url, { prefetched_body: feed_content }]) account_service = double allow(FetchRemoteStatusService).to receive(:new).and_return(account_service) |