diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /app/lib/status_filter.rb | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'app/lib/status_filter.rb')
| -rw-r--r-- | app/lib/status_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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? |