Forward ActivityPub deletes to followers of rebloggers (#4706)
This commit is contained in:
		
							parent
							
								
									884b085f53
								
							
						
					
					
						commit
						0397c58b61
					
				
					 2 changed files with 41 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										23
									
								
								app/workers/activitypub/raw_distribution_worker.rb
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								app/workers/activitypub/raw_distribution_worker.rb
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -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
 | 
			
		||||
		Loading…
	
	Add table
		
		Reference in a new issue