diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-22 23:14:24 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-22 23:14:24 +0100 |
| commit | f729cfc881a7e944c706e0dfc0f689b82613b680 (patch) | |
| tree | 6e145896ed2f1f1f9b4f7f0e9ffd5ddfb5f8bc19 | |
| parent | 9d42bff285551303ed4f49935991321de570564e (diff) | |
Private posts mentioning non-followers should not notify them, neither locally nor via Salmon
| -rw-r--r-- | app/lib/feed_manager.rb | 1 | ||||
| -rw-r--r-- | app/services/process_mentions_service.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index c07e4b05f..c6262f211 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -96,6 +96,7 @@ class FeedManager should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked should_filter ||= (status.account.silenced? && !receiver.following?(status.account)) # of if the account is silenced and I'm not following them + should_filter ||= (status.private_visibility? && !receiver.following?(status.account)) # or if the mentioned account is not permitted to see the private status if status.reply? && !status.thread.account.nil? # or it's a reply should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 98e48299e..ee42a5df2 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -28,6 +28,8 @@ class ProcessMentionsService < BaseService status.mentions.each do |mention| mentioned_account = mention.account + next if status.private_visibility? && !mentioned_account.following?(status.account) + if mentioned_account.local? NotifyService.new.call(mentioned_account, mention) else |