exclude-other-silenced-accounts (#7528)

2018-08-22 20:20:50 +09:00
parent 2374a00c10
commit 4bdab203ac
2 changed files with 2 additions and 12 deletions
--- 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