gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Add block from bot follow settings"

Browse source 
This reverts commit ff994d78fa.
This commit is contained in:
KMY 2023-09-18 21:33:05 +09:00
parent ff994d78fa
commit cfa250421e
12 changed files with 13 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spec/lib/activitypub/activity/follow_spec.rb
View file

@ -3,8 +3,7 @@
require 'rails_helper'
RSpec.describe ActivityPub::Activity::Follow do
let(:actor_type) { 'Person' }
let(:sender) { Fabricate(:account, domain: 'example.com', inbox_url: 'https://example.com/inbox', actor_type: actor_type) }
let(:sender) { Fabricate(:account, domain: 'example.com', inbox_url: 'https://example.com/inbox') }
let(:recipient) { Fabricate(:account) }
let(:json) do
@ -84,25 +83,6 @@ RSpec.describe ActivityPub::Activity::Follow do
end
end
context 'when unlocked account but locked from bot' do
let(:actor_type) { 'Service' }
before do
recipient.user.settings['lock_follow_from_bot'] = true
recipient.user.save!
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
expect(sender.follow_requests.find_by(target_account: recipient).uri).to eq 'foo'
end
end
context 'when domain block reject_straight_follow' do
before do
Fabricate(:domain_block, domain: 'example.com', reject_straight_follow: true)