From 19b78604e9dd1acb6566edd49f5c59536d5fc209 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 19 Apr 2019 14:32:41 -0500 Subject: [PATCH] Status model: `LOCAL_DOMAINS` constant has been moved into the `Account` model. --- app/models/status.rb | 3 +-- 1 file changed, 1 insertion(+), 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?