Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
The service used to be named ResolveRemoteAccountService resolves local accounts as well.
This commit is contained in:
parent
17cecd75ca
commit
613e7c7521
17 changed files with 26 additions and 26 deletions
|
@ -18,7 +18,7 @@ class AccountSearchService < BaseService
|
|||
return [] if query_blank_or_hashtag? || limit < 1
|
||||
|
||||
if resolving_non_matching_remote_account?
|
||||
[ResolveRemoteAccountService.new.call("#{query_username}@#{query_domain}")].compact
|
||||
[ResolveAccountService.new.call("#{query_username}@#{query_domain}")].compact
|
||||
else
|
||||
search_results_and_exact_match.compact.uniq.slice(0, limit)
|
||||
end
|
||||
|
|
|
@ -18,6 +18,6 @@ module AuthorExtractor
|
|||
acct = "#{username}@#{domain}"
|
||||
end
|
||||
|
||||
ResolveRemoteAccountService.new.call(acct, update_profile)
|
||||
ResolveAccountService.new.call(acct, update_profile)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -16,7 +16,7 @@ class ProcessMentionsService < BaseService
|
|||
|
||||
if mention_undeliverable?(status, mentioned_account)
|
||||
begin
|
||||
mentioned_account = resolve_remote_account_service.call($1)
|
||||
mentioned_account = resolve_account_service.call($1)
|
||||
rescue Goldfinger::Error, HTTP::Error
|
||||
mentioned_account = nil
|
||||
end
|
||||
|
@ -63,7 +63,7 @@ class ProcessMentionsService < BaseService
|
|||
).as_json).sign!(status.account))
|
||||
end
|
||||
|
||||
def resolve_remote_account_service
|
||||
ResolveRemoteAccountService.new
|
||||
def resolve_account_service
|
||||
ResolveAccountService.new
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ResolveRemoteAccountService < BaseService
|
||||
class ResolveAccountService < BaseService
|
||||
include OStatus2::MagicKey
|
||||
include JsonLdHelper
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue