about summary refs log tree commit diff
diff options
context:
space:
mode:
-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