about summary refs log tree commit diff
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-03-13 02:54:07 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:21 -0500
commit312bc14d06c7fc46d4b63024de2a6d02acae2d98 (patch)
treeb5bb778f66d3274652271bf2446fd9e032481ed1
parent0554e7c3bda14be8630369f405927efa42cf76d7 (diff)
make sure local only replies stay local
-rw-r--r--app/models/status.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 5a578fc2b..bb1bf327d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -556,7 +556,9 @@ class Status < ApplicationRecord
 
   def set_locality
     if account.domain.nil? && !attribute_changed?(:local_only)
-      self.local_only = marked_local_only? || account.user.setting_always_local
+      self.local_only = marked_local_only?
+      self.local_only ||= account.user.setting_always_local
+      self.local_only ||= reply? && Status.where(id: in_reply_to_id, local_only: true).exists?
     end
   end