diff options
Diffstat (limited to 'app/lib/feed_manager.rb')
| -rw-r--r-- | app/lib/feed_manager.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 3a26c5c05..b0dda1256 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -108,6 +108,7 @@ class FeedManager elsif status.reblog? # Filter out a reblog should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person should_filter ||= receiver.muting?(status.reblog.account) # or muting that person + should_filter ||= status.reblog.account.blocking?(receiver) # or if the author of the reblogged status is blocking me end should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked |