about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-26 19:13:56 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-26 19:13:56 +0100
commit7376af90f79b1de0c4cdd294f3f4d1481eedf0d7 (patch)
treef3c038fae202b59b50613b4f94899ad0b3291a74 /app/services
parent3282448878dd2640ea47dc1a77a4ae958ba8923e (diff)
Don't show statuses to blocked users
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 3d3cccb6a..450b0c5cc 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) unless target_account.locked?
+        follow!(account, target_account) unless target_account.locked? || target_account.blocking?(account)
       when :unfollow
         unfollow!(account, target_account)
       when :favorite