diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-25 13:13:16 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-25 13:13:16 +0100 |
| commit | 71401659b812b8768fe70aa27221e3319ee1c434 (patch) | |
| tree | 6a1002f53d00866f2f79564bc979d2afe9ac715b /app/lib | |
| parent | e3ed212b859a7bec6b26c3d52e6f7ea14069f76d (diff) | |
Fix #65 - Options to block notifications from people you don't follow/who don't follow you
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 81489365e..b812ad1f4 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -84,7 +84,7 @@ class FeedManager def filter_from_mentions?(status, receiver) should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked - should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked + should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked if status.reply? && !status.thread.account.nil? # or it's a reply should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked @@ -95,7 +95,7 @@ class FeedManager def filter_from_public?(status, receiver) should_filter = receiver.blocking?(status.account) - should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) + should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) if status.reply? && !status.thread.account.nil? should_filter ||= receiver.blocking?(status.thread.account) |