diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-22 20:56:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-22 20:56:32 +0200 |
| commit | e70fc059a9511d43b42c2502514f6220b416cdd5 (patch) | |
| tree | abc0ea9862c55c2e114c855b20eb4a35f1141709 /app/models/status.rb | |
| parent | 628fca50e20bcf41f206877083fc5ee8789c1088 (diff) | |
| parent | 56f882aed6fc81bbe4fb8821f11ba196795c99a8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index f38227b85..f9c0c68d9 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -395,7 +395,8 @@ class Status < ApplicationRecord def account_silencing_filter(account) if account.silenced? - including_silenced_accounts + including_myself = left_outer_joins(:account).where(account_id: account.id).references(:accounts) + excluding_silenced_accounts.or(including_myself) else excluding_silenced_accounts end |