From 312bc14d06c7fc46d4b63024de2a6d02acae2d98 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Wed, 13 Mar 2019 02:54:07 -0500 Subject: make sure local only replies stay local --- app/models/status.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/status.rb') 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 -- cgit