From 165e3a4efa651b77fdd29c74e57e28cad69ba421 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Thu, 27 Feb 2014 13:41:36 -0800
Subject: [PATCH] fixes #530

---
 app/assets/javascripts/comments.js | 13 ++++++++++++-
 app/logical/d_text.rb              | 22 ++++++++++++++++++++++
 app/models/forum_post.rb           |  2 +-
 app/models/post.rb                 |  2 +-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js
index de354e25e..0b2366d07 100644
--- a/app/assets/javascripts/comments.js
+++ b/app/assets/javascripts/comments.js
@@ -19,7 +19,18 @@
   }
 
   Danbooru.Comment.quote_message = function(data) {
-    var stripped_body = data["body"].replace(/\[quote\](?:.|\n|\r)+?\[\/quote\](?:\r\n|\r|\n)*/gm, "");
+    var blocks = data["body"].match(/\[\/?quote\]|./gm);
+    var n = 0;
+    var stripped_body = "";
+    $.each(blocks, function(i, block) {
+      if (block === "[quote]") {
+        n += 1;
+      } else if (block == "[/quote]") {
+        n -= 1;
+      } else if (n === 0) {
+        stripped_body += block;
+      }
+    });
     return "[quote]\n" + data["creator_name"] + " said:\n\n" + stripped_body + "\n[/quote]\n\n";
   }
 
diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 0123c3791..b1cb7a5bc 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -10,6 +10,28 @@ class DText
     CGI.escapeHTML(string)
   end
 
+  def self.strip_blocks(string, tag)
+    blocks = string.scan(/\[\/?#{tag}\]|.+?(?=\[\/?#{tag}\]|$)/m)
+    n = 0
+    stripped = ""
+    blocks.each do |block|
+      case block
+      when "[#{tag}]"
+        n += 1
+
+      when "[/#{tag}]"
+        n -= 1
+
+      else
+        if n == 0
+          stripped += block
+        end
+      end
+    end
+
+    stripped.strip
+  end
+
   def self.parse_inline(str, options = {})
     str.gsub!(/&/, "&amp;")
     str.gsub!(/</, "&lt;")
diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index 00a4bac1a..ce6dc451a 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -149,7 +149,7 @@ class ForumPost < ActiveRecord::Base
   end
 
   def quoted_response
-    stripped_body = body.gsub(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/m, "")
+    stripped_body = DText.strip_blocks(body, "quote")
     "[quote]\n#{creator_name} said:\n\n#{stripped_body}\n[/quote]\n\n"
   end
 
diff --git a/app/models/post.rb b/app/models/post.rb
index f18107a5a..97244bfa8 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -547,7 +547,7 @@ class Post < ActiveRecord::Base
     end
 
     def has_dup_tag?
-      has_tag?("duplicate") ? true : false
+      has_tag?("duplicate")
     end
 
     def tag_categories