about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-22 19:10:00 +0200
committerThibG <thib@sitedethib.com>2019-04-22 23:37:50 +0200
commit08afd6b69cdafc2b7c054042bb737e95d8ded568 (patch)
treeedd821af00a43b9319e337091208a9834cbd07b3 /app/services
parent2db0506226d0de38115e912a632d7a30afeb651e (diff)
Do not leak local-only toots to remote mentioned users
Diffstat (limited to 'app/services')
-rw-r--r--app/services/process_mentions_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 2595c5fd3..1d9448e21 100644
--- 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