* Do not LDS-sign Follow, Accept, Reject, Undo, Block * Do not use LDS for Create activities of private toots * Minor cleanup * Ignore unsigned activities instead of misattributing them * Use status.distributable? instead of querying visibility directly
		
			
				
	
	
		
			33 lines
		
	
	
	
		
			981 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
	
		
			981 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class UnblockService < BaseService
 | 
						|
  def call(account, target_account)
 | 
						|
    return unless account.blocking?(target_account)
 | 
						|
 | 
						|
    unblock = account.unblock!(target_account)
 | 
						|
    create_notification(unblock) unless target_account.local?
 | 
						|
    unblock
 | 
						|
  end
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def create_notification(unblock)
 | 
						|
    if unblock.target_account.ostatus?
 | 
						|
      NotificationWorker.perform_async(build_xml(unblock), unblock.account_id, unblock.target_account_id)
 | 
						|
    elsif unblock.target_account.activitypub?
 | 
						|
      ActivityPub::DeliveryWorker.perform_async(build_json(unblock), unblock.account_id, unblock.target_account.inbox_url)
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  def build_json(unblock)
 | 
						|
    ActiveModelSerializers::SerializableResource.new(
 | 
						|
      unblock,
 | 
						|
      serializer: ActivityPub::UndoBlockSerializer,
 | 
						|
      adapter: ActivityPub::Adapter
 | 
						|
    ).to_json
 | 
						|
  end
 | 
						|
 | 
						|
  def build_xml(block)
 | 
						|
    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unblock_salmon(block))
 | 
						|
  end
 | 
						|
end
 |