diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-03-08 06:01:17 +0000 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:21 -0500 |
| commit | 467170f4a095c5c794ae4d8f46b5d57205590013 (patch) | |
| tree | 65e84fd8b36303095aba331726f7b97902bfb8a5 /app/models/status.rb | |
| parent | b5cb68581b5cc0a1f9f421763e37028775ca448f (diff) | |
more local-only options
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index cbb89bd16..4dd889485 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -508,11 +508,7 @@ class Status < ApplicationRecord def marked_local_only? # match both with and without U+FE0F (the emoji variation selector) - /#{local_only_emoji}\ufe0f?\z/.match?(content) - end - - def local_only_emoji - '👁' + /#!\z/.match?(content) end def marked_no_replies? @@ -560,7 +556,7 @@ class Status < ApplicationRecord def set_locality if account.domain.nil? && !attribute_changed?(:local_only) - self.local_only = marked_local_only? + self.local_only = marked_local_only? || account.user.setting_always_local end end |