* Decouple Status#local? from uri being nil * Replace on-the-fly URI generation with stored URIs - Generate URI in after_save hook for local statuses - Use static value in TagManager when available, fallback to tag format - Make TagManager use ActivityPub::TagManager to understand new format - Adjust tests * Use other heuristic for locality of old statuses, do not perform long query * Exclude tombstone stream entries from Atom feed * Prevent nil statuses from landing in Pubsubhubbub::DistributionWorker * Fix URI not being saved (#4818) * Add more specs for Status * Save generated uri immediately and also fix method order to minimize diff. * Fix alternate HTML URL in Atom * Fix tests * Remove not-null constraint from statuses migration to speed it up
		
			
				
	
	
		
			51 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			51 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Pubsubhubbub::DistributionWorker
 | |
|   include Sidekiq::Worker
 | |
| 
 | |
|   sidekiq_options queue: 'push'
 | |
| 
 | |
|   def perform(stream_entry_ids)
 | |
|     stream_entries = StreamEntry.where(id: stream_entry_ids).includes(:status).reject { |e| e.status.nil? || e.status.direct_visibility? }
 | |
| 
 | |
|     return if stream_entries.empty?
 | |
| 
 | |
|     @account       = stream_entries.first.account
 | |
|     @subscriptions = active_subscriptions.to_a
 | |
| 
 | |
|     distribute_public!(stream_entries.reject(&:hidden?))
 | |
|     distribute_hidden!(stream_entries.select(&:hidden?)) if Rails.configuration.x.use_ostatus_privacy
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def distribute_public!(stream_entries)
 | |
|     return if stream_entries.empty?
 | |
| 
 | |
|     @payload = OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, stream_entries))
 | |
| 
 | |
|     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription|
 | |
|       [subscription.id, @payload]
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def distribute_hidden!(stream_entries)
 | |
|     return if stream_entries.empty?
 | |
| 
 | |
|     @payload = OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, stream_entries))
 | |
|     @domains = @account.followers.domains
 | |
| 
 | |
|     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.select { |s| allowed_to_receive?(s.callback_url, s.domain) }) do |subscription|
 | |
|       [subscription.id, @payload]
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def active_subscriptions
 | |
|     Subscription.where(account: @account).active.select('id, callback_url, domain')
 | |
|   end
 | |
| 
 | |
|   def allowed_to_receive?(callback_url, domain)
 | |
|     (!domain.nil? && @domains.include?(domain)) || @domains.include?(Addressable::URI.parse(callback_url).host)
 | |
|   end
 | |
| end
 |