2 files changed, 33 insertions, 1 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index cef595319..37e316354 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -6,7 +6,10 @@ class ActivityPub::ProcessingWorker
   sidekiq_options backtrace: true, retry: 8
 
   def perform(account_id, body, delivered_to_account_id = nil)
-    ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
+    account = Account.find_by(id: account_id)
+    return if account.nil?
+
+    ActivityPub::ProcessCollectionService.new.call(body, account, override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
   rescue ActiveRecord::RecordInvalid => e
     Rails.logger.debug "Error processing incoming ActivityPub object: #{e}"
   end
diff --git a/app/workers/activitypub/status_update_distribution_worker.rb b/app/workers/activitypub/status_update_distribution_worker.rb
new file mode 100644
index 000000000..a79ede2bf
--- /dev/null
+++ b/app/workers/activitypub/status_update_distribution_worker.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWorker
+  # Distribute an profile update to servers that might have a copy
+  # of the account in question
+  def perform(status_id, options = {})
+    @options = options.with_indifferent_access
+    @status  = Status.find(status_id)
+    @account = @status.account
+
+    distribute!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  protected
+
+  def activity
+    ActivityPub::ActivityPresenter.new(
+      id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
+      type: 'Update',
+      actor: ActivityPub::TagManager.instance.uri_for(@status.account),
+      published: @status.edited_at,
+      to: ActivityPub::TagManager.instance.to(@status),
+      cc: ActivityPub::TagManager.instance.cc(@status),
+      virtual_object: @status
+    )
+  end
+end