From 4d08871722a9186f0c82c41c6a465982f80c06b2 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Thu, 20 Aug 2020 06:23:13 -0500 Subject: [Bug] Do not directly merge frozen options hash --- app/services/fetch_remote_status_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb index 19b2a28c8..4f98b51f6 100644 --- a/app/services/fetch_remote_status_service.rb +++ b/app/services/fetch_remote_status_service.rb @@ -12,9 +12,9 @@ class FetchRemoteStatusService < BaseService resource_options = { prefetched_body: prefetched_body } end - resource_options ||= {} - resource_options[:on_behalf_of] = on_behalf_of + return if resource_url.blank? - ActivityPub::FetchRemoteStatusService.new.call(resource_url, **resource_options) unless resource_url.nil? + resource_options ||= {} + ActivityPub::FetchRemoteStatusService.new.call(resource_url, **resource_options.merge({ on_behalf_of: on_behalf_of })) end end -- cgit