From 46522d8c1bfdd4c0d7eae708b0e31dd37848f097 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Mon, 6 May 2019 03:46:15 -0500
Subject: Do not process mentions or bangtags in drafts.  Add `draft?` method
 to `Status` model.

---
 app/lib/bangtags.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/lib/bangtags.rb')

diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb
index d18141e71..9bcea41df 100644
--- a/app/lib/bangtags.rb
+++ b/app/lib/bangtags.rb
@@ -41,7 +41,7 @@ class Bangtags
     status.text.gsub!('#!!', "#\u200c!")
 
     status.text.split(/(#!(?:.*:!#|{.*?}|[^\s#]+))/).each do |chunk|
-      if @vore_stack.last == '_draft'
+      if @vore_stack.last == '_draft' || (@chunks.present? && @chunks.first.include?('#!draft'))
         @chunks << chunk
       elsif chunk.starts_with?("#!")
         chunk.sub!(/(\\:)?+:+?!#\Z/, '\1')
@@ -396,7 +396,7 @@ class Bangtags
           end
         when 'draft'
           chunk = nil
-          @chunks.insert(0, "[center]`#!draft!#`[/center]\n") unless @chunks.first.include?('#!draft')
+          @chunks.insert(0, "[center]`#!draft!#`[/center]\n") unless @chunks.present? && @chunks.first.include?('#!draft')
           status.visibility = :direct
           @vore_stack.push('_draft')
           @component_stack.push(:var)
-- 
cgit