diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-04 23:11:18 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 16:32:36 -0600 |
| commit | fbf08920a0d73231c04b35c263ea4e04224b6e7d (patch) | |
| tree | afc2717ba1e5b121d170d0d5adc5236cf73f78dd /app/models/form/account_batch.rb | |
| parent | 82bd234c3cb4aed81ab4e4c8844bd27d065ea4d9 (diff) | |
Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)
Diffstat (limited to 'app/models/form/account_batch.rb')
| -rw-r--r-- | app/models/form/account_batch.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb index eed65b47a..f1b7a4566 100644 --- a/app/models/form/account_batch.rb +++ b/app/models/form/account_batch.rb @@ -3,6 +3,7 @@ class Form::AccountBatch include ActiveModel::Model include Authorization + include Payloadable attr_accessor :account_ids, :action, :current_account @@ -52,13 +53,9 @@ class Form::AccountBatch def reject_follow!(follow) follow.destroy - json = ActiveModelSerializers::SerializableResource.new( - follow, - serializer: ActivityPub::RejectFollowSerializer, - adapter: ActivityPub::Adapter - ).to_json + return unless follow.account.activitypub? - ActivityPub::DeliveryWorker.perform_async(json, current_account.id, follow.account.inbox_url) + ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), current_account.id, follow.account.inbox_url) end def approve! |