* 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
		
			
				
	
	
		
			54 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			54 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
require 'rails_helper'
 | 
						|
 | 
						|
RSpec.describe ActivityPub::Activity::Delete do
 | 
						|
  let(:sender)    { Fabricate(:account, domain: 'example.com') }
 | 
						|
  let(:status)    { Fabricate(:status, account: sender, uri: 'foobar') }
 | 
						|
 | 
						|
  let(:json) do
 | 
						|
    {
 | 
						|
      '@context': 'https://www.w3.org/ns/activitystreams',
 | 
						|
      id: 'foo',
 | 
						|
      type: 'Delete',
 | 
						|
      actor: ActivityPub::TagManager.instance.uri_for(sender),
 | 
						|
      object: ActivityPub::TagManager.instance.uri_for(status),
 | 
						|
      signature: 'foo',
 | 
						|
    }.with_indifferent_access
 | 
						|
  end
 | 
						|
 | 
						|
  describe '#perform' do
 | 
						|
    subject { described_class.new(json, sender) }
 | 
						|
 | 
						|
    before do
 | 
						|
      subject.perform
 | 
						|
    end
 | 
						|
 | 
						|
    it 'deletes sender\'s status' do
 | 
						|
      expect(Status.find_by(id: status.id)).to be_nil
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  context 'when the status has been reblogged' do
 | 
						|
    describe '#perform' do
 | 
						|
      subject { described_class.new(json, sender) }
 | 
						|
      let(:reblogger) { Fabricate(:account) }
 | 
						|
      let(:follower)   { Fabricate(:account, username: 'follower', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 | 
						|
 | 
						|
      before do
 | 
						|
        stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
 | 
						|
        follower.follow!(reblogger)
 | 
						|
        Fabricate(:status, account: reblogger, reblog: status)
 | 
						|
        subject.perform
 | 
						|
      end
 | 
						|
 | 
						|
      it 'deletes sender\'s status' do
 | 
						|
        expect(Status.find_by(id: status.id)).to be_nil
 | 
						|
      end
 | 
						|
 | 
						|
      it 'sends delete activity to followers of rebloggers' do
 | 
						|
        # one for Delete original post, and one for Undo reblog (normal delivery)
 | 
						|
        expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.twice
 | 
						|
      end
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |