marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Status model: `LOCAL_DOMAINS` constant has been moved into the `Account` model.

staging
multiple creatures 2019-04-19 14:32:41 -05:00
parent a230a6038b
commit 19b78604e9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/status.rb
View File

@ -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?