diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
| commit | efc9ffcb80b995ef8c8d95ab1d8cb0af8efc094d (patch) | |
| tree | 6ce57e5980ba0279355f97893d21852caace0232 /app/lib | |
| parent | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (diff) | |
| parent | 718802a05dfb3211d758513daf6070ffa22751dd (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/status_filter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb index a6a050ce1..41d4381e5 100644 --- 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 |