From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 15 Dec 2017 00:54:05 +0000 (+0100)
Subject: Do not hide statuses from silenced accounts from other silenced accounts (#6030)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3d3b403359db2ccd8d6b0c873ffe57231f8615e1;p=mastodon.git

Do not hide statuses from silenced accounts from other silenced accounts (#6030)
---

diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index 27e1f9d30..a6a050ce1 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -35,7 +35,7 @@ class StatusFilter
   end
 
   def silenced_account?
-    status_account_silenced? && !account_following_status_account?
+    !account&.silenced? && status_account_silenced? && !account_following_status_account?
   end
 
   def status_account_silenced?