Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 142dec64e..6ef0b2bdd 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -161,7 +161,7 @@ class Status < ApplicationRecord
     private
 
     def filter_timeline(query, account)
-      blocked = Block.where(account: account).pluck(:target_account_id)
+      blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id)
       query   = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty?
       query   = query.where('accounts.silenced = TRUE') if account.silenced?
       query