Merge tag 'v4.4.4' into chinwag-next

app/lib/activitypub/activity/create.rb

@@ -56,11 +56,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     process_audience
 
     ApplicationRecord.transaction do
-      @status = Status.create!(@params)
+      @status = Status.create!(@params.merge(quote: @quote))
       attach_tags(@status)
       attach_mentions(@status)
       attach_counts(@status)
-      attach_quote(@status)
     end
 
     resolve_thread(@status)
@@ -202,13 +201,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
   end
 
-  def attach_quote(status)
-    return if @quote.nil?
-
-    @quote.status = status
-    @quote.save
-  end
-
   def process_tags
     return if @object['tag'].nil?
 

app/lib/activitypub/activity/delete.rb

@@ -61,6 +61,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
 
     ActivityPub::Forwarder.new(@account, @json, @quote.status).forward!
     @quote.reject!
+    DistributionWorker.perform_async(@quote.status_id, { 'update' => true })
   end
 
   def forwarder