github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 10:43:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor quoting improvements to email cooker

Browse Source
This commit is contained in:
Robin Ward 2016-07-15 15:36:56 -04:00
parent 61ada93a99
commit 56a7249498
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/email_cook.rb
View File

@ -10,6 +10,13 @@ class EmailCook
@raw = raw
end
def add_quote(result, buffer)
if buffer.present?
return if buffer =~ /\A(<br>)+\z$/
result << "<blockquote>#{buffer}</blockquote>"
end
end
def cook
result = ""
@ -23,7 +30,7 @@ class EmailCook
in_quote = true
quote_buffer << l.sub(/^[\s>]*/, '') << "<br>"
elsif in_quote
result << "<blockquote>#{quote_buffer}</blockquote>"
add_quote(result, quote_buffer)
quote_buffer = ""
in_quote = false
else
@ -49,8 +56,8 @@ class EmailCook
end
end
if in_quote
result << "<blockquote>#{quote_buffer}</blockquote>"
if in_quote && quote_buffer.present?
add_quote(result, quote_buffer)
end
result.gsub!(/(<br>\n*){3,10}/, '<br><br>')