]> cat aescling's git repositories - mastodon.git/commitdiff
Restore ReplyDistributionWorker to allow existing jobs to be processed (#9676)
authorThibG <thib@sitedethib.com>
Tue, 1 Jan 2019 12:43:11 +0000 (13:43 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 1 Jan 2019 12:43:11 +0000 (13:43 +0100)
app/workers/activitypub/reply_distribution_worker.rb [new file with mode: 0644]

diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
new file mode 100644 (file)
index 0000000..d8fea6c
--- /dev/null
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Obsolete but kept around to make sure existing jobs do not fail after upgrade.
+# Should be removed in a subsequent release.
+
+class ActivityPub::ReplyDistributionWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'push'
+
+  def perform(status_id)
+    @status  = Status.find(status_id)
+    @account = @status.thread&.account
+
+    return unless @account.present? && @status.distributable?
+
+    ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
+      [payload, @status.account_id, inbox_url]
+    end
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  private
+
+  def inboxes
+    @inboxes ||= @account.followers.inboxes
+  end
+
+  def signed_payload
+    Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@status.account))
+  end
+
+  def unsigned_payload
+    ActiveModelSerializers::SerializableResource.new(
+      @status,
+      serializer: ActivityPub::ActivitySerializer,
+      adapter: ActivityPub::Adapter
+    ).as_json
+  end
+
+  def payload
+    @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+  end
+end