diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /app/workers/activitypub/delivery_worker.rb | |
parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to 'app/workers/activitypub/delivery_worker.rb')
-rw-r--r-- | app/workers/activitypub/delivery_worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index 323a9f85b..adbb496d9 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -10,7 +10,8 @@ class ActivityPub::DeliveryWorker HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze - def perform(json, source_account_id, inbox_url) + def perform(json, source_account_id, inbox_url, options = {}) + @options = options.with_indifferent_access @json = json @source_account = Account.find(source_account_id) @inbox_url = inbox_url @@ -27,7 +28,7 @@ class ActivityPub::DeliveryWorker def build_request request = Request.new(:post, @inbox_url, body: @json) - request.on_behalf_of(@source_account, :uri) + request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with]) request.add_headers(HEADERS) end |