* 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
		
			
				
	
	
		
			142 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			142 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| require 'rails_helper'
 | |
| 
 | |
| RSpec.describe FollowService, type: :service do
 | |
|   let(:sender) { Fabricate(:account, username: 'alice') }
 | |
| 
 | |
|   subject { FollowService.new }
 | |
| 
 | |
|   context 'local account' do
 | |
|     describe 'locked account' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         subject.call(sender, bob.acct)
 | |
|       end
 | |
| 
 | |
|       it 'creates a follow request with reblogs' do
 | |
|         expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: true)).to_not be_nil
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'locked account, no reblogs' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         subject.call(sender, bob.acct, reblogs: false)
 | |
|       end
 | |
| 
 | |
|       it 'creates a follow request without reblogs' do
 | |
|         expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: false)).to_not be_nil
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'unlocked account, from silenced account' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         sender.touch(:silenced_at)
 | |
|         subject.call(sender, bob.acct)
 | |
|       end
 | |
| 
 | |
|       it 'creates a follow request with reblogs' do
 | |
|         expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: true)).to_not be_nil
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'unlocked account, from a muted account' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         bob.mute!(sender)
 | |
|         subject.call(sender, bob.acct)
 | |
|       end
 | |
| 
 | |
|       it 'creates a following relation with reblogs' do
 | |
|         expect(sender.following?(bob)).to be true
 | |
|         expect(sender.muting_reblogs?(bob)).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'unlocked account' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         subject.call(sender, bob.acct)
 | |
|       end
 | |
| 
 | |
|       it 'creates a following relation with reblogs' do
 | |
|         expect(sender.following?(bob)).to be true
 | |
|         expect(sender.muting_reblogs?(bob)).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'unlocked account, no reblogs' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         subject.call(sender, bob.acct, reblogs: false)
 | |
|       end
 | |
| 
 | |
|       it 'creates a following relation without reblogs' do
 | |
|         expect(sender.following?(bob)).to be true
 | |
|         expect(sender.muting_reblogs?(bob)).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'already followed account' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         sender.follow!(bob)
 | |
|         subject.call(sender, bob.acct)
 | |
|       end
 | |
| 
 | |
|       it 'keeps a following relation' do
 | |
|         expect(sender.following?(bob)).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'already followed account, turning reblogs off' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         sender.follow!(bob, reblogs: true)
 | |
|         subject.call(sender, bob.acct, reblogs: false)
 | |
|       end
 | |
| 
 | |
|       it 'disables reblogs' do
 | |
|         expect(sender.muting_reblogs?(bob)).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'already followed account, turning reblogs on' do
 | |
|       let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
 | |
| 
 | |
|       before do
 | |
|         sender.follow!(bob, reblogs: false)
 | |
|         subject.call(sender, bob.acct, reblogs: true)
 | |
|       end
 | |
| 
 | |
|       it 'disables reblogs' do
 | |
|         expect(sender.muting_reblogs?(bob)).to be false
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   context 'remote ActivityPub account' do
 | |
|     let(:bob) { Fabricate(:user, account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
 | |
| 
 | |
|     before do
 | |
|       stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {})
 | |
|       subject.call(sender, bob.acct)
 | |
|     end
 | |
| 
 | |
|     it 'creates follow request' do
 | |
|       expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
 | |
|     end
 | |
| 
 | |
|     it 'sends a follow activity to the inbox' do
 | |
|       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
 | |
|     end
 | |
|   end
 | |
| end
 |