about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-22 11:32:21 +0200
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:15 -0500
commit1588a4af0c4b0dec67af547e895594c723d178e3 (patch)
treece42aae6836015627224f041c5b2bd762d0f0653 /app/models
parent6635f2acce9296825784a61a2a2ec5610c6ebe3a (diff)
Don't leak reblogs of local-only toots
Co-authored-by: Fire Demon <firedemon@creature.cafe>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 657fcaca0..4a83a08c8 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -537,7 +537,10 @@ class Status < ApplicationRecord
   end
 
   def set_locality
-    self.local_only = marked_local_only? if account.domain.nil? && !attribute_changed?(:local_only)
+    if account.domain.nil? && !attribute_changed?(:local_only)
+      self.local_only = marked_local_only?
+    end
+    self.local_only = reblog.local_only if reblog?
   end
 
   def set_conversation_perms