diff options
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/bangtags.rb | 4 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb index e1fcc307d..1b27f712e 100644 --- a/app/lib/bangtags.rb +++ b/app/lib/bangtags.rb @@ -77,7 +77,7 @@ class Bangtags status.text.gsub!('#!!', "#\ufdd6!") status.text.split(/(#!(?:.*:!#|{.*?}|[^\s#]+))/).each do |chunk| - if @vore_stack.last == '_draft' || (@chunks.present? && @chunks.first.include?('#!draft')) + if @vore_stack.last == '_draft' || (@chunks.present? && status.draft?) chunk.gsub("#\ufdd6!", '#!') @chunks << chunk elsif chunk.starts_with?("#!") @@ -543,10 +543,8 @@ class Bangtags end when 'draft' chunk = nil - @chunks.insert(0, "[center]`#!draft!#`[/center]\n") unless @chunks.present? && @chunks.first.include?('#!draft') @status.visibility = :direct @status.local_only = true - @status.content_type = 'text/x-bbcode+markdown' @vore_stack.push('_draft') @component_stack.push(:var) add_tags(status, 'self.draft') diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 31cfc8220..5a1572c05 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -240,6 +240,10 @@ class Formatter html = "#{html.strip}\n<p class=\"signature\">— #{footer}</p>" end + if status.draft? + html = "<h1 class=\"draft\">Draft</h1>\n#{html}" + end + html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify] html.html_safe # rubocop:disable Rails/OutputSafety end |