diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-22 23:17:57 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-22 23:17:57 +0100 |
| commit | 05b13c38b54b7d29ea4368999100c27cb7deb29e (patch) | |
| tree | 7744112010d89cb56f1694372ab9a332dde2ab8d /app | |
| parent | f729cfc881a7e944c706e0dfc0f689b82613b680 (diff) | |
Re-enable Webfinger for locked accounts but don't handle "follow" events
coming in via Salmon. Currently no way to prevent remote follows, but they will only receive public and unlisted posts
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/xrd_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/process_interaction_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb index c3c38063c..9e0277860 100644 --- a/app/controllers/xrd_controller.rb +++ b/app/controllers/xrd_controller.rb @@ -13,7 +13,7 @@ class XrdController < ApplicationController end def webfinger - @account = Account.where(locked: false).find_local!(username_from_resource) + @account = Account.find_local!(username_from_resource) @canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}" @magic_key = pem_to_magic_key(@account.keypair.public_key) diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb index 4e5487681..3d3cccb6a 100644 --- a/app/services/process_interaction_service.rb +++ b/app/services/process_interaction_service.rb @@ -30,7 +30,7 @@ class ProcessInteractionService < BaseService case verb(xml) when :follow - follow!(account, target_account) + follow!(account, target_account) unless target_account.locked? when :unfollow unfollow!(account, target_account) when :favorite |