From 4bdab203ac5ca06d757d08af8a2bc184c86e3bbe Mon Sep 17 00:00:00 2001 From: masarakki Date: Wed, 22 Aug 2018 20:20:50 +0900 Subject: exclude-other-silenced-accounts (#7528) --- app/models/status.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/status.rb b/app/models/status.rb index 6ba7b7a50..35655bff2 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -384,7 +384,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 -- cgit