about summary refs log tree commit diff
path: root/app/lib/feed_manager.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-03-15 22:52:57 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-03-15 22:55:45 +0100
commit74ae158c2f7b7d282ce1cc754ac83d27467a7215 (patch)
tree59f599673fd1121f596684961ea47f8236c1b5f8 /app/lib/feed_manager.rb
parentc1124228e857b0e85f5bf927d2c41c7fadfdf955 (diff)
Add "direct" visibility level in the backend. Web UI is not yet
adjusted to allow choosing it, yet
Diffstat (limited to 'app/lib/feed_manager.rb')
-rw-r--r--app/lib/feed_manager.rb1
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