about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-06-15 02:00:08 +0200
committerGitHub <noreply@github.com>2017-06-15 02:00:08 +0200
commit8518d005fdd989797a4f0e1161332bb7f908cfcb (patch)
tree596a17f984e2b82c9b04342656eb44c13959f5c3 /app
parentbb911043de61580e33ad617270bae2abc21bad55 (diff)
Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)
Diffstat (limited to 'app')
-rw-r--r--app/lib/status_filter.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index 89d45d442..27e1f9d30 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -9,7 +9,7 @@ class StatusFilter
   end
 
   def filtered?
-    account_present? && filtered_status?
+    blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
   end
 
   private
@@ -19,7 +19,7 @@ class StatusFilter
   end
 
   def filtered_status?
-    blocking_account? || blocking_domain? || muting_account? || silenced_account? || blocked_by_policy?
+    blocking_account? || blocking_domain? || muting_account?
   end
 
   def blocking_account?
@@ -43,7 +43,7 @@ class StatusFilter
   end
 
   def account_following_status_account?
-    account.following? status.account_id
+    account&.following? status.account_id
   end
 
   def blocked_by_policy?