class FollowService < BaseService
include Redisable
include Payloadable
+ include DomainControlHelper
# Follow a remote user, notify remote user about the follow
# @param [Account] source_account From which to follow
- # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
+ # @param [Account] target_account Account to follow
# @param [Hash] options
# @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
# @option [Boolean] :notify Whether to create notifications about new posts, defaults to false
# @option [Boolean] :with_rate_limit
def call(source_account, target_account, options = {})
@source_account = source_account
- @target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
+ @target_account = target_account
@options = { bypass_locked: false, bypass_limit: false, with_rate_limit: false }.merge(options)
raise ActiveRecord::RecordNotFound if following_not_possible?
end
def following_not_allowed?
- @target_account.blocking?(@source_account) || @source_account.blocking?(@target_account) || @target_account.moved? || (!@target_account.local? && @target_account.ostatus?) || @source_account.domain_blocking?(@target_account.domain)
+ domain_not_allowed?(@target_account.domain) || @target_account.blocking?(@source_account) || @source_account.blocking?(@target_account) || @target_account.moved? || (!@target_account.local? && @target_account.ostatus?) || @source_account.domain_blocking?(@target_account.domain)
end
def change_follow_options!
# @param [String, Account] uri URI in the username@domain format or account record
# @param [Hash] options
# @option options [Boolean] :redirected Do not follow further Webfinger redirects
- # @option options [Boolean] :skip_webfinger Do not attempt to refresh account data
+ # @option options [Boolean] :skip_webfinger Do not attempt any webfinger query or refreshing account data
# @return [Account]
def call(uri, options = {})
return if uri.blank?
def webfinger_update_due?
return false if @options[:check_delivery_availability] && !DeliveryFailureTracker.available?(@domain)
+ return false if @options[:skip_webfinger]
- @account.nil? || ((!@options[:skip_webfinger] || @account.ostatus?) && @account.possibly_stale?)
+ @account.nil? || (@account.ostatus? && @account.possibly_stale?)
end
def activitypub_ready?
let(:follower) { Fabricate(:account, username: 'bob') }
before do
- FollowService.new.call(follower, user.account.acct)
+ FollowService.new.call(follower, user.account)
allow(controller).to receive(:doorkeeper_token) { token }
end
@mention_from_status = mentioning_status.mentions.first
@favourite = FavouriteService.new.call(other.account, first_status)
@second_favourite = FavouriteService.new.call(third.account, first_status)
- @follow = FollowService.new.call(other.account, 'alice')
+ @follow = FollowService.new.call(other.account, user.account)
end
describe 'with no options' do
allow(ResolveAccountService).to receive(:new).and_return(service)
allow(service).to receive(:call).with('user@hostname').and_return(target_account)
- allow(service).to receive(:call).with(target_account, skip_webfinger: true).and_return(target_account)
post :create, params: { acct: 'acct:user@hostname' }
- expect(service).to have_received(:call).with(target_account, skip_webfinger: true)
expect(account.following?(target_account)).to be true
expect(response).to render_template(:success)
end
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
before do
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'creates a follow request with 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)
+ subject.call(sender, bob, reblogs: false)
end
it 'creates a follow request without reblogs' do
before do
sender.touch(:silenced_at)
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'creates a follow request with reblogs' do
before do
bob.mute!(sender)
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'creates a following relation with reblogs' do
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
before do
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'creates a following relation with 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)
+ subject.call(sender, bob, reblogs: false)
end
it 'creates a following relation without reblogs' do
before do
sender.follow!(bob)
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'keeps a following relation' do
before do
sender.follow!(bob, reblogs: true)
- subject.call(sender, bob.acct, reblogs: false)
+ subject.call(sender, bob, reblogs: false)
end
it 'disables reblogs' do
before do
sender.follow!(bob, reblogs: false)
- subject.call(sender, bob.acct, reblogs: true)
+ subject.call(sender, bob, reblogs: true)
end
it 'disables reblogs' do
before do
stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {})
- subject.call(sender, bob.acct)
+ subject.call(sender, bob)
end
it 'creates follow request' do
stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:hoge@example.com').to_return(status: 410)
end
+ context 'using skip_webfinger' do
+ context 'when account is known' do
+ let!(:remote_account) { Fabricate(:account, username: 'foo', domain: 'ap.example.com', protocol: 'activitypub') }
+
+ context 'when domain is banned' do
+ let!(:domain_block) { Fabricate(:domain_block, domain: 'ap.example.com', severity: :suspend) }
+
+ it 'does not return an account' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
+ end
+
+ it 'does not make a webfinger query' do
+ subject.call('foo@ap.example.com', skip_webfinger: true)
+ expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
+ end
+ end
+
+ context 'when domain is not banned' do
+ it 'returns the expected account' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to eq remote_account
+ end
+
+ it 'does not make a webfinger query' do
+ subject.call('foo@ap.example.com', skip_webfinger: true)
+ expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
+ end
+ end
+ end
+
+ context 'when account is not known' do
+ it 'does not return an account' do
+ expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
+ end
+
+ it 'does not make a webfinger query' do
+ subject.call('foo@ap.example.com', skip_webfinger: true)
+ expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
+ end
+ end
+ end
+
context 'when there is an LRDD endpoint but no resolvable account' do
before do
stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))
cat aescling's git repositories / mastodon.git / commitdiff