* Change silenced accounts to require approval on follow * Also require approval for follows by people explicitly muted by target accounts * Do not auto-accept silenced or muted accounts when switching from locked to unlocked * Add `follow_requests_count` to verify_credentials * Show “Follow requests” menu item if needed even if account is locked * Add tests * Correctly reflect that follow requests weren't auto-accepted when local account is silenced * Accept follow requests from user-muted accounts to avoid leaking mutes
		
			
				
	
	
		
			79 lines
		
	
	
	
		
			2 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			79 lines
		
	
	
	
		
			2 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
require 'rails_helper'
 | 
						|
 | 
						|
RSpec.describe ActivityPub::Activity::Follow do
 | 
						|
  let(:sender)    { Fabricate(:account) }
 | 
						|
  let(:recipient) { Fabricate(:account) }
 | 
						|
 | 
						|
  let(:json) do
 | 
						|
    {
 | 
						|
      '@context': 'https://www.w3.org/ns/activitystreams',
 | 
						|
      id: 'foo',
 | 
						|
      type: 'Follow',
 | 
						|
      actor: ActivityPub::TagManager.instance.uri_for(sender),
 | 
						|
      object: ActivityPub::TagManager.instance.uri_for(recipient),
 | 
						|
    }.with_indifferent_access
 | 
						|
  end
 | 
						|
 | 
						|
  describe '#perform' do
 | 
						|
    subject { described_class.new(json, sender) }
 | 
						|
 | 
						|
    context 'unlocked account' do
 | 
						|
      before do
 | 
						|
        subject.perform
 | 
						|
      end
 | 
						|
 | 
						|
      it 'creates a follow from sender to recipient' do
 | 
						|
        expect(sender.following?(recipient)).to be true
 | 
						|
      end
 | 
						|
 | 
						|
      it 'does not create a follow request' do
 | 
						|
        expect(sender.requested?(recipient)).to be false
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    context 'silenced account following an unlocked account' do
 | 
						|
      before do
 | 
						|
        sender.touch(:silenced_at)
 | 
						|
        subject.perform
 | 
						|
      end
 | 
						|
 | 
						|
      it 'does not create a follow from sender to recipient' do
 | 
						|
        expect(sender.following?(recipient)).to be false
 | 
						|
      end
 | 
						|
 | 
						|
      it 'creates a follow request' do
 | 
						|
        expect(sender.requested?(recipient)).to be true
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    context 'unlocked account muting the sender' do
 | 
						|
      before do
 | 
						|
        recipient.mute!(sender)
 | 
						|
        subject.perform
 | 
						|
      end
 | 
						|
 | 
						|
      it 'creates a follow from sender to recipient' do
 | 
						|
        expect(sender.following?(recipient)).to be true
 | 
						|
      end
 | 
						|
 | 
						|
      it 'does not create a follow request' do
 | 
						|
        expect(sender.requested?(recipient)).to be false
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    context 'locked account' do
 | 
						|
      before do
 | 
						|
        recipient.update(locked: true)
 | 
						|
        subject.perform
 | 
						|
      end
 | 
						|
 | 
						|
      it 'does not create a follow from sender to recipient' do
 | 
						|
        expect(sender.following?(recipient)).to be false
 | 
						|
      end
 | 
						|
 | 
						|
      it 'creates a follow request' do
 | 
						|
        expect(sender.requested?(recipient)).to be true
 | 
						|
      end
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |