Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00
parent e5a9831a56 098c7d27fe
commit 37254c4f5d
11 changed files with 80 additions and 74 deletions
--- 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?