From 613e7c7521252bd85e473d9c63cbc8b8e1a733a8 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 22 Jan 2018 22:25:09 +0900
Subject: [PATCH] Rename ResolveRemoteAccountService to ResolveAccountService
(#6327)
The service used to be named ResolveRemoteAccountService resolves local
accounts as well.
---
app/controllers/activitypub/inboxes_controller.rb | 2 +-
app/controllers/authorize_follows_controller.rb | 2 +-
app/controllers/concerns/signature_verification.rb | 2 +-
app/models/account.rb | 2 +-
app/models/form/migration.rb | 2 +-
app/services/account_search_service.rb | 2 +-
app/services/concerns/author_extractor.rb | 2 +-
app/services/follow_service.rb | 2 +-
app/services/process_mentions_service.rb | 6 +++---
...mote_account_service.rb => resolve_account_service.rb} | 2 +-
app/workers/import/relationship_worker.rb | 2 +-
...remote_account_worker.rb => resolve_account_worker.rb} | 4 ++--
spec/controllers/authorize_follows_controller_spec.rb | 4 ++--
spec/controllers/settings/imports_controller_spec.rb | 4 ++--
spec/models/account_spec.rb | 8 ++++----
spec/services/account_search_service_spec.rb | 4 ++--
...nt_service_spec.rb => resolve_account_service_spec.rb} | 2 +-
17 files changed, 26 insertions(+), 26 deletions(-)
rename app/services/{resolve_remote_account_service.rb => resolve_account_service.rb} (99%)
rename app/workers/{resolve_remote_account_worker.rb => resolve_account_worker.rb} (64%)
rename spec/services/{resolve_remote_account_service_spec.rb => resolve_account_service_spec.rb} (99%)
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 76553a162a..7d0bc74d3e 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::InboxesController < Api::BaseController
def upgrade_account
if signed_request_account.ostatus?
signed_request_account.update(last_webfingered_at: nil)
- ResolveRemoteAccountWorker.perform_async(signed_request_account.acct)
+ ResolveAccountWorker.perform_async(signed_request_account.acct)
end
Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed?
diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
index 7afe664d1b..775d5f23fb 100644
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -41,7 +41,7 @@ class AuthorizeFollowsController < ApplicationController
end
def account_from_remote_follow
- ResolveRemoteAccountService.new.call(acct_without_prefix)
+ ResolveAccountService.new.call(acct_without_prefix)
end
def acct_param_is_url?
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 2baafb5bf5..f289228d3c 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -114,7 +114,7 @@ module SignatureVerification
def account_from_key_id(key_id)
if key_id.start_with?('acct:')
- ResolveRemoteAccountService.new.call(key_id.gsub(/\Aacct:/, ''))
+ ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, ''))
elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
account = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
account ||= ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false)
diff --git a/app/models/account.rb b/app/models/account.rb
index 5900fee4a3..13692d0d7d 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -163,7 +163,7 @@ class Account < ApplicationRecord
def refresh!
return if local?
- ResolveRemoteAccountService.new.call(acct)
+ ResolveAccountService.new.call(acct)
end
def unsuspend!
diff --git a/app/models/form/migration.rb b/app/models/form/migration.rb
index b749873376..c2a8655e13 100644
--- a/app/models/form/migration.rb
+++ b/app/models/form/migration.rb
@@ -20,6 +20,6 @@ class Form::Migration
private
def set_account
- self.account = (ResolveRemoteAccountService.new.call(acct) if account.nil? && acct.present?)
+ self.account = (ResolveAccountService.new.call(acct) if account.nil? && acct.present?)
end
end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 3be1106654..3860a9cbd0 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -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
diff --git a/app/services/concerns/author_extractor.rb b/app/services/concerns/author_extractor.rb
index c2366188ab..1e00eb803b 100644
--- a/app/services/concerns/author_extractor.rb
+++ b/app/services/concerns/author_extractor.rb
@@ -18,6 +18,6 @@ module AuthorExtractor
acct = "#{username}@#{domain}"
end
- ResolveRemoteAccountService.new.call(acct, update_profile)
+ ResolveAccountService.new.call(acct, update_profile)
end
end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index ac0207a0ab..60a389afd3 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -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)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 46401f298a..8e285e1f73 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -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
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_account_service.rb
similarity index 99%
rename from app/services/resolve_remote_account_service.rb
rename to app/services/resolve_account_service.rb
index d7d0be2105..fd6d306056 100644
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class ResolveRemoteAccountService < BaseService
+class ResolveAccountService < BaseService
include OStatus2::MagicKey
include JsonLdHelper
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index ed4c962c19..1dd8bf8fbb 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -7,7 +7,7 @@ class Import::RelationshipWorker
def perform(account_id, target_account_uri, relationship)
from_account = Account.find(account_id)
- target_account = ResolveRemoteAccountService.new.call(target_account_uri)
+ target_account = ResolveAccountService.new.call(target_account_uri)
return if target_account.nil?
diff --git a/app/workers/resolve_remote_account_worker.rb b/app/workers/resolve_account_worker.rb
similarity index 64%
rename from app/workers/resolve_remote_account_worker.rb
rename to app/workers/resolve_account_worker.rb
index 5dd84ccb6b..cd7c4d7dda 100644
--- a/app/workers/resolve_remote_account_worker.rb
+++ b/app/workers/resolve_account_worker.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
-class ResolveRemoteAccountWorker
+class ResolveAccountWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull', unique: :until_executed
def perform(uri)
- ResolveRemoteAccountService.new.call(uri)
+ ResolveAccountService.new.call(uri)
end
end
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb
index 26e46a23c2..b1cbef7ea9 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_follows_controller_spec.rb
@@ -30,7 +30,7 @@ describe AuthorizeFollowsController do
it 'renders error when account cant be found' do
service = double
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
allow(service).to receive(:call).with('missing@hostname').and_return(nil)
get :show, params: { acct: 'acct:missing@hostname' }
@@ -54,7 +54,7 @@ describe AuthorizeFollowsController do
it 'sets account from acct uri' do
account = Account.new
service = double
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
allow(service).to receive(:call).with('found@hostname').and_return(account)
get :show, params: { acct: 'acct:found@hostname' }
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index 4810be7015..59b10e0da2 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
describe 'POST #create' do
it 'redirects to settings path with successful following import' do
service = double(call: nil)
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
post :create, params: {
import: {
type: 'following',
@@ -30,7 +30,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
it 'redirects to settings path with successful blocking import' do
service = double(call: nil)
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
post :create, params: {
import: {
type: 'blocking',
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 9c1492c90e..a8b24d0e22 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -185,8 +185,8 @@ RSpec.describe Account, type: :model do
expect(account.refresh!).to be_nil
end
- it 'calls not ResolveRemoteAccountService#call' do
- expect_any_instance_of(ResolveRemoteAccountService).not_to receive(:call).with(acct)
+ it 'calls not ResolveAccountService#call' do
+ expect_any_instance_of(ResolveAccountService).not_to receive(:call).with(acct)
account.refresh!
end
end
@@ -194,8 +194,8 @@ RSpec.describe Account, type: :model do
context 'domain is present' do
let(:domain) { 'example.com' }
- it 'calls ResolveRemoteAccountService#call' do
- expect_any_instance_of(ResolveRemoteAccountService).to receive(:call).with(acct).once
+ it 'calls ResolveAccountService#call' do
+ expect_any_instance_of(ResolveAccountService).to receive(:call).with(acct).once
account.refresh!
end
end
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 4685e619f8..9bb27edad8 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -123,7 +123,7 @@ describe AccountSearchService do
describe 'when there is a domain but no exact match' do
it 'follows the remote account when resolve is true' do
service = double(call: nil)
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
results = subject.call('newuser@remote.com', 10, nil, resolve: true)
expect(service).to have_received(:call).with('newuser@remote.com')
@@ -131,7 +131,7 @@ describe AccountSearchService do
it 'does not follow the remote account when resolve is false' do
service = double(call: nil)
- allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
+ allow(ResolveAccountService).to receive(:new).and_return(service)
results = subject.call('newuser@remote.com', 10, nil, resolve: false)
expect(service).not_to have_received(:call)
diff --git a/spec/services/resolve_remote_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
similarity index 99%
rename from spec/services/resolve_remote_account_service_spec.rb
rename to spec/services/resolve_account_service_spec.rb
index d0bb6a1373..5f1b4467b6 100644
--- a/spec/services/resolve_remote_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-RSpec.describe ResolveRemoteAccountService do
+RSpec.describe ResolveAccountService do
subject { described_class.new }
before do
--
GitLab