Private posts mentioning non-followers should not notify them, neither locally nor...

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c07e4b05f965d8c191c5a8e7405a8ae0f6cb20cf..c6262f211369dc239c5970439b80f0bb2796db30 100644 (file)
--- 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 98e48299e6221f2e5d3a12bb4531b752435258fa..ee42a5df24e69c77891d2ab4cd6100e55b6ea36e 100644 (file)
--- 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