From 6c374b51537126a2cba29f3eaf74faf1fc64ba96 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Mon, 6 May 2019 20:51:20 -0500 Subject: Drop OStatus support. Fix some of the Rspec tests. --- app/controllers/concerns/account_controller_concern.rb | 8 -------- app/controllers/concerns/signature_verification.rb | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'app/controllers/concerns') diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb index 9ac50a5ca..e5a041f2f 100644 --- a/app/controllers/concerns/account_controller_concern.rb +++ b/app/controllers/concerns/account_controller_concern.rb @@ -30,7 +30,6 @@ module AccountControllerConcern response.headers['Link'] = LinkHeader.new( [ webfinger_account_link, - atom_account_url_link, actor_url_link, ] ) @@ -47,13 +46,6 @@ module AccountControllerConcern ] end - def atom_account_url_link - [ - account_url(@account, format: 'atom'), - [%w(rel alternate), %w(type application/atom+xml)], - ] - end - def actor_url_link [ ActivityPub::TagManager.instance.uri_for(@account), diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb index 91566c4fa..e7301a620 100644 --- a/app/controllers/concerns/signature_verification.rb +++ b/app/controllers/concerns/signature_verification.rb @@ -145,7 +145,7 @@ module SignatureVerification end def account_refresh_key(account) - return if account.local? || !account.activitypub? + return if account.local? ActivityPub::FetchRemoteAccountService.new.call(account.uri, only_key: true) end end -- cgit