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

2018-02-11 04:10:16 +00:00
parent b6159bcb0a 718802a05d
commit efc9ffcb80
18 changed files with 389 additions and 60 deletions
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -9,6 +9,7 @@ class StatusFilter
  end

  def filtered?
+    return false if !account.nil? && account.id == status.account_id
    blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
  end