From 467170f4a095c5c794ae4d8f46b5d57205590013 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 8 Mar 2019 06:01:17 +0000 Subject: more local-only options --- app/models/status.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'app/models/status.rb') 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 -- cgit