From f3be6052867343ab15cc84bc91edcaf0c1d70115 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 19 Jun 2017 01:51:04 +0200 Subject: [PATCH] Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) Rename Activitypub to ActivityPub --- app/controllers/api/activitypub/activities_controller.rb | 2 +- app/controllers/api/activitypub/notes_controller.rb | 2 +- app/controllers/api/activitypub/outbox_controller.rb | 2 +- app/controllers/authorize_follows_controller.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 | 2 +- ...e_account_service.rb => resolve_remote_account_service.rb} | 2 +- app/views/activitypub/types/collection.activitystreams2.rabl | 2 +- .../types/ordered_collection_page.activitystreams2.rabl | 2 +- app/workers/import_worker.rb | 4 ++-- config/initializers/inflections.rb | 1 + .../controllers/api/activitypub/activities_controller_spec.rb | 2 +- spec/controllers/api/activitypub/notes_controller_spec.rb | 2 +- spec/controllers/api/activitypub/outbox_controller_spec.rb | 2 +- spec/controllers/authorize_follows_controller_spec.rb | 4 ++-- spec/controllers/settings/imports_controller_spec.rb | 4 ++-- spec/services/account_search_service_spec.rb | 4 ++-- ...service_spec.rb => resolve_remote_account_service_spec.rb} | 4 ++-- 20 files changed, 25 insertions(+), 24 deletions(-) rename app/services/{follow_remote_account_service.rb => resolve_remote_account_service.rb} (98%) rename spec/services/{follow_remote_account_service_spec.rb => resolve_remote_account_service_spec.rb} (97%) diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb index 740c8589a7..a880ee92f2 100644 --- a/app/controllers/api/activitypub/activities_controller.rb +++ b/app/controllers/api/activitypub/activities_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::ActivitiesController < Api::BaseController +class Api::ActivityPub::ActivitiesController < Api::BaseController include Authorization # before_action :set_follow, only: [:show_follow] diff --git a/app/controllers/api/activitypub/notes_controller.rb b/app/controllers/api/activitypub/notes_controller.rb index 783c1c4edd..96652b8791 100644 --- a/app/controllers/api/activitypub/notes_controller.rb +++ b/app/controllers/api/activitypub/notes_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::NotesController < Api::BaseController +class Api::ActivityPub::NotesController < Api::BaseController include Authorization before_action :set_status diff --git a/app/controllers/api/activitypub/outbox_controller.rb b/app/controllers/api/activitypub/outbox_controller.rb index 0738d7dee5..1af04cb54f 100644 --- a/app/controllers/api/activitypub/outbox_controller.rb +++ b/app/controllers/api/activitypub/outbox_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::OutboxController < Api::BaseController +class Api::ActivityPub::OutboxController < Api::BaseController before_action :set_account respond_to :activitystreams2 diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb index b15883d583..da4ef022a0 100644 --- a/app/controllers/authorize_follows_controller.rb +++ b/app/controllers/authorize_follows_controller.rb @@ -40,7 +40,7 @@ class AuthorizeFollowsController < ApplicationController end def account_from_remote_follow - FollowRemoteAccountService.new.call(acct_without_prefix) + ResolveRemoteAccountService.new.call(acct_without_prefix) end def acct_param_is_url? diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index 2b77ad7c6e..c266494f00 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? - [FollowRemoteAccountService.new.call("#{query_username}@#{query_domain}")] + [ResolveRemoteAccountService.new.call("#{query_username}@#{query_domain}")] 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 ae32eebbb5..00fe1c6639 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 - FollowRemoteAccountService.new.call(acct, update_profile) + ResolveRemoteAccountService.new.call(acct, update_profile) end end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 4de75e98d7..e54ff7d0f5 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -7,7 +7,7 @@ class FollowService < BaseService # @param [Account] source_account From which to follow # @param [String] uri User URI to follow in the form of username@domain def call(source_account, uri) - target_account = FollowRemoteAccountService.new.call(uri) + target_account = ResolveRemoteAccountService.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 aa0a4d71bb..438033d22b 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -41,6 +41,6 @@ class ProcessMentionsService < BaseService private def follow_remote_account_service - @follow_remote_account_service ||= FollowRemoteAccountService.new + @follow_remote_account_service ||= ResolveRemoteAccountService.new end end diff --git a/app/services/follow_remote_account_service.rb b/app/services/resolve_remote_account_service.rb similarity index 98% rename from app/services/follow_remote_account_service.rb rename to app/services/resolve_remote_account_service.rb index 30ba7bc75a..362d0df98b 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/resolve_remote_account_service.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class FollowRemoteAccountService < BaseService +class ResolveRemoteAccountService < BaseService include OStatus2::MagicKey include HttpHelper diff --git a/app/views/activitypub/types/collection.activitystreams2.rabl b/app/views/activitypub/types/collection.activitystreams2.rabl index d3f8ddcac1..cc0e532b71 100644 --- a/app/views/activitypub/types/collection.activitystreams2.rabl +++ b/app/views/activitypub/types/collection.activitystreams2.rabl @@ -1,3 +1,3 @@ extends 'activitypub/intransient.activitystreams2.rabl' -node(:type) { 'Collection' } +node(:type) { 'Collection' } diff --git a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl b/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl index c821fa9288..9937d11e9c 100644 --- a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl +++ b/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl @@ -1,3 +1,3 @@ extends 'activitypub/types/ordered_collection.activitystreams2.rabl' -node(:type) { 'OrderedCollectionPage' } +node(:type) { 'OrderedCollectionPage' } diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb index e93fa33cf9..90a2262064 100644 --- a/app/workers/import_worker.rb +++ b/app/workers/import_worker.rb @@ -41,7 +41,7 @@ class ImportWorker def process_mutes import_rows.each do |row| begin - target_account = FollowRemoteAccountService.new.call(row.first) + target_account = ResolveRemoteAccountService.new.call(row.first) next if target_account.nil? MuteService.new.call(from_account, target_account) rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError @@ -53,7 +53,7 @@ class ImportWorker def process_blocks import_rows.each do |row| begin - target_account = FollowRemoteAccountService.new.call(row.first) + target_account = ResolveRemoteAccountService.new.call(row.first) next if target_account.nil? BlockService.new.call(from_account, target_account) rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index b5e43e705f..a7b1ef690f 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -13,4 +13,5 @@ ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.acronym 'StatsD' inflect.acronym 'OEmbed' + inflect.acronym 'ActivityPub' end diff --git a/spec/controllers/api/activitypub/activities_controller_spec.rb b/spec/controllers/api/activitypub/activities_controller_spec.rb index 2c966a45a2..07df28ac2b 100644 --- a/spec/controllers/api/activitypub/activities_controller_spec.rb +++ b/spec/controllers/api/activitypub/activities_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::Activitypub::ActivitiesController, type: :controller do +RSpec.describe Api::ActivityPub::ActivitiesController, type: :controller do render_views let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } diff --git a/spec/controllers/api/activitypub/notes_controller_spec.rb b/spec/controllers/api/activitypub/notes_controller_spec.rb index 39ddec03e2..a0f05dc659 100644 --- a/spec/controllers/api/activitypub/notes_controller_spec.rb +++ b/spec/controllers/api/activitypub/notes_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::Activitypub::NotesController, type: :controller do +RSpec.describe Api::ActivityPub::NotesController, type: :controller do render_views let(:user_alice) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } diff --git a/spec/controllers/api/activitypub/outbox_controller_spec.rb b/spec/controllers/api/activitypub/outbox_controller_spec.rb index 99797c582d..049cf451d7 100644 --- a/spec/controllers/api/activitypub/outbox_controller_spec.rb +++ b/spec/controllers/api/activitypub/outbox_controller_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe Api::Activitypub::OutboxController, type: :controller do +RSpec.describe Api::ActivityPub::OutboxController, type: :controller do render_views let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb index 1bc4eb6b77..b801aa6617 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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).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 8bf6aec2b4..4810be7015 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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).to receive(:new).and_return(service) post :create, params: { import: { type: 'blocking', diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb index 697ac8f23c..25bb56bca7 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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).to receive(:new).and_return(service) results = subject.call('newuser@remote.com', 10, 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(FollowRemoteAccountService).to receive(:new).and_return(service) + allow(ResolveRemoteAccountService).to receive(:new).and_return(service) results = subject.call('newuser@remote.com', 10, false) expect(service).not_to have_received(:call) diff --git a/spec/services/follow_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb similarity index 97% rename from spec/services/follow_remote_account_service_spec.rb rename to spec/services/resolve_remote_account_service_spec.rb index 9ae9ff0ce5..ad4d436ba3 100644 --- a/spec/services/follow_remote_account_service_spec.rb +++ b/spec/services/resolve_remote_account_service_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -RSpec.describe FollowRemoteAccountService do - subject { FollowRemoteAccountService.new } +RSpec.describe ResolveRemoteAccountService do + subject { ResolveRemoteAccountService.new } before do stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))