From 4bdab203ac5ca06d757d08af8a2bc184c86e3bbe Mon Sep 17 00:00:00 2001 From: masarakki Date: Wed, 22 Aug 2018 20:20:50 +0900 Subject: [PATCH] exclude-other-silenced-accounts (#7528) --- app/models/status.rb | 3 ++- spec/models/status_spec.rb | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index 6ba7b7a509..35655bff23 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 diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index d03005107e..9d8670129d 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -573,17 +573,6 @@ RSpec.describe Status, type: :model do expect(results).to include(es_status) end end - - context 'where that account is silenced' do - it 'includes statuses from other accounts that are silenced' do - @account.update(silenced: true) - other_silenced_account = Fabricate(:account, silenced: true) - other_status = Fabricate(:status, account: other_silenced_account) - - results = Status.as_public_timeline(@account) - expect(results).to include(other_status) - end - end end end