Do not leak local-only toots to remote mentioned users

6 years ago · 2d2eca5bda
parent 2ad61962ae
commit 2d2eca5bda
1 changed files with 2 additions and 2 deletions
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@ -48,9 +48,9 @@ class ProcessMentionsService < BaseService

    if mentioned_account.local?
      LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name)
-    elsif mentioned_account.ostatus? && !@status.stream_entry.hidden?
+    elsif mentioned_account.ostatus? && !@status.stream_entry.hidden? && !@status.local_only?
      NotificationWorker.perform_async(ostatus_xml, @status.account_id, mentioned_account.id)
-    elsif mentioned_account.activitypub?
+    elsif mentioned_account.activitypub? && !@status.local_only?
      ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url)
    end
  end