commit: 0397c58b61d8a364ff488fc5631bfc751903c242
parent: 884b085f534b02c664bcddd3a2fefcad6d4e5cc4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 26 Aug 2017 18:52:53 +0200
Forward ActivityPub deletes to followers of rebloggers (#4706)
Diffstat:
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
@@ -8,7 +8,24 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
if status.nil?
delete_later!(object_uri)
else
- RemoveStatusService.new.call(status)
+ forward_for_reblogs(status)
+ delete_now!(status)
end
end
+
+ private
+
+ def forward_for_reblogs(status)
+ ActivityPub::RawDistributionWorker.push_bulk(status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)) do |account|
+ [payload, account.id]
+ end
+ end
+
+ def delete_now!(status)
+ RemoveStatusService.new.call(status)
+ end
+
+ def payload
+ @payload ||= Oj.dump(@json)
+ end
end
diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ActivityPub::RawDistributionWorker
+ include Sidekiq::Worker
+
+ sidekiq_options queue: 'push'
+
+ def perform(json, source_account_id)
+ @account = Account.find(source_account_id)
+
+ ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
+ [json, @account.id, inbox_url]
+ end
+ rescue ActiveRecord::RecordNotFound
+ true
+ end
+
+ private
+
+ def inboxes
+ @inboxes ||= @account.followers.inboxes
+ end
+end