post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

Browse source 
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
This commit is contained in:
Akihiko Odaki 2018-01-22 22:25:09 +09:00 • committed by Eugen Rochko
parent 17cecd75ca
commit 613e7c7521
17 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/follow_service.rb
View file

@ -9,7 +9,7 @@ class FollowService < BaseService
# @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
def call(source_account, uri, reblogs: nil)
reblogs = true if reblogs.nil?
target_account = uri.is_a?(Account) ? uri : ResolveRemoteAccountService.new.call(uri)
target_account = uri.is_a?(Account) ? uri : ResolveAccountService.new.call(uri)
raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account)