about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authormasarakki <masaki182@gmail.com>2018-08-22 20:20:50 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-08-22 13:20:50 +0200
commit4bdab203ac5ca06d757d08af8a2bc184c86e3bbe (patch)
tree603f68588f5912db3956edb7fafefb608d33fed4 /app/models
parent2374a00c1062a70e9092d88579e1351e4c8128f9 (diff)
exclude-other-silenced-accounts (#7528)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb3
1 files changed, 2 insertions, 1 deletions
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