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

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