diff options
| -rw-r--r-- | app/controllers/activitypub/follows_controller.rb | 22 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/accept.rb | 17 | ||||
| -rw-r--r-- | app/lib/activitypub/tag_manager.rb | 8 | ||||
| -rw-r--r-- | app/models/follow_request.rb | 4 | ||||
| -rw-r--r-- | app/serializers/activitypub/follow_serializer.rb | 9 | ||||
| -rw-r--r-- | app/views/accounts/_header.html.haml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 3 | ||||
| -rw-r--r-- | spec/controllers/activitypub/follows_controller_spec.rb | 43 | ||||
| -rw-r--r-- | spec/lib/activitypub/activity/accept_spec.rb | 53 | ||||
| -rw-r--r-- | spec/models/follow_request_spec.rb | 8 |
10 files changed, 31 insertions, 138 deletions
diff --git a/app/controllers/activitypub/follows_controller.rb b/app/controllers/activitypub/follows_controller.rb deleted file mode 100644 index 038bcbabc..000000000 --- a/app/controllers/activitypub/follows_controller.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::FollowsController < Api::BaseController - include SignatureVerification - - def show - render json: follow_request, - serializer: ActivityPub::FollowSerializer, - adapter: ActivityPub::Adapter, - content_type: 'application/activity+json' - end - - private - - def follow_request - FollowRequest.includes(:account).references(:account).find_by!( - id: params.require(:id), - accounts: { domain: nil, username: params.require(:account_username) }, - target_account: signed_request_account - ) - end -end diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb index d0082483c..bd90c9019 100644 --- a/app/lib/activitypub/activity/accept.rb +++ b/app/lib/activitypub/activity/accept.rb @@ -2,18 +2,16 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity def perform - if @object.respond_to?(:[]) && - @object['type'] == 'Follow' && @object['actor'].present? - accept_follow_from @object['actor'] - else - accept_follow_object @object + case @object['type'] + when 'Follow' + accept_follow end end private - def accept_follow_from(actor) - target_account = account_from_uri(value_or_id(actor)) + def accept_follow + target_account = account_from_uri(target_uri) return if target_account.nil? || !target_account.local? @@ -21,8 +19,7 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity follow_request&.authorize! end - def accept_follow_object(object) - follow_request = ActivityPub::TagManager.instance.uri_to_resource(value_or_id(object), FollowRequest) - follow_request&.authorize! + def target_uri + @target_uri ||= value_or_id(@object['actor']) end end diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index 1c35e1672..0708713e6 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -28,8 +28,6 @@ class ActivityPub::TagManager return target.uri if target.respond_to?(:local?) && !target.local? case target.object_type - when :follow - account_follow_url(target.account.username, target) when :person account_url(target) when :note, :comment, :activity @@ -99,12 +97,6 @@ class ActivityPub::TagManager case klass.name when 'Account' klass.find_local(uri_to_local_id(uri, :username)) - when 'FollowRequest' - params = Rails.application.routes.recognize_path(uri) - klass.joins(:account).find_by!( - accounts: { domain: nil, username: params[:account_username] }, - id: params[:id] - ) else StatusFinder.new(uri).status end diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 33e5fec12..ebf6959ce 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -21,10 +21,6 @@ class FollowRequest < ApplicationRecord validates :account_id, uniqueness: { scope: :target_account_id } - def object_type - :follow - end - def authorize! account.follow!(target_account, reblogs: show_reblogs) MergeWorker.perform_async(target_account.id, account.id) diff --git a/app/serializers/activitypub/follow_serializer.rb b/app/serializers/activitypub/follow_serializer.rb index eecd64701..86c9992fe 100644 --- a/app/serializers/activitypub/follow_serializer.rb +++ b/app/serializers/activitypub/follow_serializer.rb @@ -1,12 +1,11 @@ # frozen_string_literal: true class ActivityPub::FollowSerializer < ActiveModel::Serializer - attributes :type, :actor - attribute :id, if: :dereferencable? + attributes :id, :type, :actor attribute :virtual_object, key: :object def id - ActivityPub::TagManager.instance.uri_for(object) + [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join end def type @@ -20,8 +19,4 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer def virtual_object ActivityPub::TagManager.instance.uri_for(object.target_account) end - - def dereferencable? - object.respond_to?(:object_type) - end end diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 3800bd837..d4081af64 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -8,7 +8,7 @@ = fa_icon 'user-times' = t('accounts.unfollow') - else - = link_to account_follows_path(account), data: { method: :post }, class: 'icon-button' do + = link_to account_follow_path(account), data: { method: :post }, class: 'icon-button' do = fa_icon 'user-plus' = t('accounts.follow') - elsif !user_signed_in? diff --git a/config/routes.rb b/config/routes.rb index 21ad0a93f..80a2c6d13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -54,8 +54,7 @@ Rails.application.routes.draw do resources :followers, only: [:index], controller: :follower_accounts resources :following, only: [:index], controller: :following_accounts - resources :follows, only: [:show], module: :activitypub - resource :follow, only: [:create], controller: :account_follow, as: :follows + resource :follow, only: [:create], controller: :account_follow resource :unfollow, only: [:create], controller: :account_unfollow resource :outbox, only: [:show], module: :activitypub resource :inbox, only: [:create], module: :activitypub diff --git a/spec/controllers/activitypub/follows_controller_spec.rb b/spec/controllers/activitypub/follows_controller_spec.rb deleted file mode 100644 index 6026cd353..000000000 --- a/spec/controllers/activitypub/follows_controller_spec.rb +++ /dev/null @@ -1,43 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe ActivityPub::FollowsController, type: :controller do - let(:follow_request) { Fabricate(:follow_request, account: account) } - - render_views - - context 'with local account' do - let(:account) { Fabricate(:account, domain: nil) } - - it 'returns follow request' do - signed_request = Request.new(:get, account_follow_url(account, follow_request)) - signed_request.on_behalf_of(follow_request.target_account) - request.headers.merge! signed_request.headers - - get :show, params: { id: follow_request, account_username: account.username } - - expect(body_as_json[:id]).to eq ActivityPub::TagManager.instance.uri_for(follow_request) - expect(response).to have_http_status :success - end - - it 'returns http 404 without signature' do - get :show, params: { id: follow_request, account_username: account.username } - expect(response).to have_http_status 404 - end - end - - context 'with remote account' do - let(:account) { Fabricate(:account, domain: Faker::Internet.domain_name) } - - it 'returns http 404' do - signed_request = Request.new(:get, account_follow_url(account, follow_request)) - signed_request.on_behalf_of(follow_request.target_account) - request.headers.merge! signed_request.headers - - get :show, params: { id: follow_request, account_username: account.username } - - expect(response).to have_http_status 404 - end - end -end diff --git a/spec/lib/activitypub/activity/accept_spec.rb b/spec/lib/activitypub/activity/accept_spec.rb index 9f43be35d..6503c83e3 100644 --- a/spec/lib/activitypub/activity/accept_spec.rb +++ b/spec/lib/activitypub/activity/accept_spec.rb @@ -3,49 +3,36 @@ require 'rails_helper' RSpec.describe ActivityPub::Activity::Accept do let(:sender) { Fabricate(:account) } let(:recipient) { Fabricate(:account) } - let!(:follow_request) { Fabricate(:follow_request, account: recipient, target_account: sender) } + + let(:json) do + { + '@context': 'https://www.w3.org/ns/activitystreams', + id: 'foo', + type: 'Accept', + actor: ActivityPub::TagManager.instance.uri_for(sender), + object: { + id: 'bar', + type: 'Follow', + actor: ActivityPub::TagManager.instance.uri_for(recipient), + object: ActivityPub::TagManager.instance.uri_for(sender), + }, + }.with_indifferent_access + end describe '#perform' do subject { described_class.new(json, sender) } before do + Fabricate(:follow_request, account: recipient, target_account: sender) subject.perform end - context 'with concerete object representation' do - let(:json) do - { - '@context': 'https://www.w3.org/ns/activitystreams', - id: 'foo', - type: 'Accept', - actor: ActivityPub::TagManager.instance.uri_for(sender), - object: { - type: 'Follow', - actor: ActivityPub::TagManager.instance.uri_for(recipient), - object: ActivityPub::TagManager.instance.uri_for(sender), - }, - }.with_indifferent_access - end - - it 'creates a follow relationship' do - expect(recipient.following?(sender)).to be true - end + it 'creates a follow relationship' do + expect(recipient.following?(sender)).to be true end - context 'with object represented by id' do - let(:json) do - { - '@context': 'https://www.w3.org/ns/activitystreams', - id: 'foo', - type: 'Accept', - actor: ActivityPub::TagManager.instance.uri_for(sender), - object: ActivityPub::TagManager.instance.uri_for(follow_request), - }.with_indifferent_access - end - - it 'creates a follow relationship' do - expect(recipient.following?(sender)).to be true - end + it 'removes the follow request' do + expect(recipient.requested?(sender)).to be false end end end diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb index 7e10631a3..59893a14f 100644 --- a/spec/models/follow_request_spec.rb +++ b/spec/models/follow_request_spec.rb @@ -27,12 +27,4 @@ RSpec.describe FollowRequest, type: :model do expect(follow_request.account.muting_reblogs?(target)).to be true end end - - describe '#object_type' do - let(:follow_request) { Fabricate(:follow_request) } - - it 'equals to :follow' do - expect(follow_request.object_type).to eq :follow - end - end end |