diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-08 09:48:42 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-08 09:48:42 -0600 |
commit | 65986b6f0b66ea285b89bb82531067db146d8ecc (patch) | |
tree | 6c69dd7748ef1cd9ccc8cb1af32a4f27ca23586a /app/controllers | |
parent | 2dc4fbbd1a13adbdca26a0b42ee6e289e736bba1 (diff) | |
parent | f839ac694c3f8050e4c7ec84884283e35f6ac662 (diff) |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/activitypub/follows_controller.rb | 22 |
1 files changed, 0 insertions, 22 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 |