about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-09 09:58:37 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:23 -0500
commitedfabe44dafe84a6936d1d9957db1d8857a1d4d7 (patch)
tree53209e0dd9a81d2761eb144aba7b2976272b7265 /app/models
parent540728e063bb57aa18a21d92116d85fbef0c8230 (diff)
Statuses: set `local_only` flag from the `PostStatusService`. Default to `en` locale for statuses.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 1141d3f4f..0b26e4605 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -569,8 +569,6 @@ class Status < ApplicationRecord
   def set_locality
     if account.domain.nil? && !attribute_changed?(:local_only)
       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