* Add tests * Ensure deleted statuses are marked as such * Save some redis memory by not storing URIs in delete_upon_arrival values * Avoid possible race condition when processing incoming Deletes * Avoid potential duplicate Delete forwards * Lower lock durations to reduce issues in case of hard crash of the Rails process * Check for `lock.aquired?` and improve comment * Refactor RedisLock usage in app/lib/activitypub * Fix using incorrect or non-existent sender for relaying Deletes
		
			
				
	
	
		
			68 lines
		
	
	
	
		
			1.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
	
		
			1.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class ActivityPub::Activity::Announce < ActivityPub::Activity
 | |
|   def perform
 | |
|     return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity?
 | |
| 
 | |
|     lock_or_fail("announce:#{@object['id']}") do
 | |
|       original_status = status_from_object
 | |
| 
 | |
|       return reject_payload! if original_status.nil? || !announceable?(original_status)
 | |
| 
 | |
|       @status = Status.find_by(account: @account, reblog: original_status)
 | |
| 
 | |
|       return @status unless @status.nil?
 | |
| 
 | |
|       @status = Status.create!(
 | |
|         account: @account,
 | |
|         reblog: original_status,
 | |
|         uri: @json['id'],
 | |
|         created_at: @json['published'],
 | |
|         override_timestamps: @options[:override_timestamps],
 | |
|         visibility: visibility_from_audience
 | |
|       )
 | |
| 
 | |
|       distribute(@status)
 | |
|     end
 | |
| 
 | |
|     @status
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def audience_to
 | |
|     as_array(@json['to']).map { |x| value_or_id(x) }
 | |
|   end
 | |
| 
 | |
|   def audience_cc
 | |
|     as_array(@json['cc']).map { |x| value_or_id(x) }
 | |
|   end
 | |
| 
 | |
|   def visibility_from_audience
 | |
|     if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
 | |
|       :public
 | |
|     elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
 | |
|       :unlisted
 | |
|     elsif audience_to.include?(@account.followers_url)
 | |
|       :private
 | |
|     else
 | |
|       :direct
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def announceable?(status)
 | |
|     status.account_id == @account.id || status.distributable?
 | |
|   end
 | |
| 
 | |
|   def related_to_local_activity?
 | |
|     followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status?
 | |
|   end
 | |
| 
 | |
|   def requested_through_relay?
 | |
|     super || Relay.find_by(inbox_url: @account.inbox_url)&.enabled?
 | |
|   end
 | |
| 
 | |
|   def reblog_of_local_status?
 | |
|     status_from_uri(object_uri)&.account&.local?
 | |
|   end
 | |
| end
 |