diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-04-19 14:32:41 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:22 -0500 |
| commit | 19b78604e9dd1acb6566edd49f5c59536d5fc209 (patch) | |
| tree | 2d0ddb6e428b1797e454a99e34d2d7c5a992cf71 | |
| parent | a230a6038bae4cccb3f456ad25acf47cc5cf1ea8 (diff) | |
Status model: `LOCAL_DOMAINS` constant has been moved into the `Account` model.
| -rw-r--r-- | app/models/status.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index e6dd81cd4..eff81cb4e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -38,7 +38,6 @@ class Status < ApplicationRecord include Cacheable include StatusThreadingConcern - LOCAL_DOMAINS = ENV.fetch('LOCAL_DOMAINS', '').chomp.split(/\.?\s+/).freeze # match both with and without U+FE0F (the emoji variation selector) LOCAL_ONLY_TOKENS = /(?:#!|\u{1f441}\ufe0f?)\u200b?\z/ FORCE_SENSITIVE = ENV.fetch('FORCE_SENSITIVE', '').chomp.split(/\.?\s+/).freeze @@ -177,7 +176,7 @@ class Status < ApplicationRecord end def network? - attributes['network'] || local? || account.domain.in?(LOCAL_DOMAINS) + attributes['network'] || local? || account.network? end def relayed? |