diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-09 17:43:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-10 00:03:28 +0200 |
| commit | 1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch) | |
| tree | ccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /app/controllers/api/v1/statuses/pins_controller.rb | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | ac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
Diffstat (limited to 'app/controllers/api/v1/statuses/pins_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/statuses/pins_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/statuses/pins_controller.rb b/app/controllers/api/v1/statuses/pins_controller.rb index bba6a6f48..54f8be667 100644 --- a/app/controllers/api/v1/statuses/pins_controller.rb +++ b/app/controllers/api/v1/statuses/pins_controller.rb @@ -39,7 +39,7 @@ class Api::V1::Statuses::PinsController < Api::BaseController adapter: ActivityPub::Adapter ).as_json - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account) + ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account.id) end def distribute_remove_activity! @@ -49,6 +49,6 @@ class Api::V1::Statuses::PinsController < Api::BaseController adapter: ActivityPub::Adapter ).as_json - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account) + ActivityPub::RawDistributionWorker.perform_async(Oj.dump(json), current_account.id) end end |