about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-22 23:17:57 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-22 23:17:57 +0100
commit05b13c38b54b7d29ea4368999100c27cb7deb29e (patch)
tree7744112010d89cb56f1694372ab9a332dde2ab8d /app/services
parentf729cfc881a7e944c706e0dfc0f689b82613b680 (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/services')
-rw-r--r--app/services/process_interaction_service.rb2
1 files changed, 1 insertions, 1 deletions
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