Make sure that local-only tokens still get detected when signature is enabled.

staging
multiple creatures 2019-04-19 14:10:57 -05:00
parent 4088e0a648
commit a230a6038b
2 changed files with 4 additions and 2 deletions

View File

@ -379,6 +379,7 @@ class Bangtags
next if name.blank?
description = @vars["_they:are:#{name}"]
next if description.blank?
status.local_only = true if Status::LOCAL_ONLY_TOKENS.match?(@chunks.last)
@chunks << "\n\n---\n #{description}"
when 'media'
media_idx = post_cmd[1]

View File

@ -39,6 +39,8 @@ class Status < ApplicationRecord
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
FORCE_UNLISTED = ENV.fetch('FORCE_UNLISTED', '').chomp.split(/\.?\s+/).freeze
@ -500,8 +502,7 @@ class Status < ApplicationRecord
end
def marked_local_only?
# match both with and without U+FE0F (the emoji variation selector)
/(?:#!|\u{1f441}\ufe0f?)\u200b?\z/.match?(content)
LOCAL_ONLY_TOKENS.match?(content)
end
def marked_no_replies?