about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-26 19:33:00 +0200
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:15 -0500
commit0ed210cd5b8c6d3b743fd0e320c4705fa6a08d34 (patch)
tree1f2719282a0dcedee4863f8fc84ec2491635057a /app/models
parent1588a4af0c4b0dec67af547e895594c723d178e3 (diff)
[Privacy, Port: glitch-soc@0898ff9] Set replies to local-only toots as local-only unless explicitly specified otherwise
Co-authored-by: Fire Demon <firedemon@creature.cafe>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 4a83a08c8..164c6cb8e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -538,8 +538,9 @@ class Status < ApplicationRecord
 
   def set_locality
     if account.domain.nil? && !attribute_changed?(:local_only)
-      self.local_only = marked_local_only?
+      self.local_only = true if marked_local_only?
     end
+    self.local_only = true if thread&.local_only? && self.local_only.nil?
     self.local_only = reblog.local_only if reblog?
   end