diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-28 20:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 20:36:55 +0100 |
| commit | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (patch) | |
| tree | 770029d865518400da31e9cdb55fc9c584e5a90b /app/controllers/activitypub/inboxes_controller.rb | |
| parent | ee1f1a2ec97604ed364a5944bd300be0771ba7d7 (diff) | |
| parent | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (diff) | |
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub/inboxes_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index af51e32d5..8f5e1887e 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -36,6 +36,6 @@ class ActivityPub::InboxesController < Api::BaseController end def process_payload - ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8')) + ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'), @account&.id) end end |