diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-10 22:56:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-10 22:56:36 +0100 |
commit | dc02a93d04815c618dc55748fff3cfe64c7023d9 (patch) | |
tree | 5b6d56d248379823660d70dc35c95e4c547f43ea /app/services/fetch_remote_status_service.rb | |
parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
parent | 87419f9307f54755af4604876ac149262ae3f0a6 (diff) |
Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/fetch_remote_status_service.rb')
-rw-r--r-- | app/services/fetch_remote_status_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb index eafde4d4a..08c2d24ba 100644 --- a/app/services/fetch_remote_status_service.rb +++ b/app/services/fetch_remote_status_service.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class FetchRemoteStatusService < BaseService - def call(url, prefetched_body = nil) + def call(url, prefetched_body: nil, request_id: nil) if prefetched_body.nil? resource_url, resource_options = FetchResourceService.new.call(url) else @@ -9,6 +9,6 @@ class FetchRemoteStatusService < BaseService resource_options = { prefetched_body: prefetched_body } end - ActivityPub::FetchRemoteStatusService.new.call(resource_url, **resource_options) unless resource_url.nil? + ActivityPub::FetchRemoteStatusService.new.call(resource_url, **resource_options.merge(request_id: request_id)) unless resource_url.nil? end end |