IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: less aggressive gmail eliding

Browse Source
This commit is contained in:
Régis Hanol
2018-07-04 20:04:46 +02:00
parent 448e2fe1a2
commit 8a53941fe0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/receiver.rb
View File

@@ -301,7 +301,7 @@ module Email
end end
HTML_EXTRACTERS ||= [ HTML_EXTRACTERS ||= [
[:gmail, /class="gmail_(?!default)/], [:gmail, /class="gmail_(signature|extra)/],
[:outlook, /id="(divRplyFwdMsg|Signature)"/], [:outlook, /id="(divRplyFwdMsg|Signature)"/],
[:word, /class="WordSection1"/], [:word, /class="WordSection1"/],
[:exchange, /name="message(Body|Reply)Section"/], [:exchange, /name="message(Body|Reply)Section"/],
@@ -313,9 +313,8 @@ module Email
] ]
def extract_from_gmail(doc) def extract_from_gmail(doc)
# GMail adds a bunch of 'gmail_' prefixed classes like: gmail_signature, gmail_extra, gmail_quote # GMail adds a bunch of 'gmail_' prefixed classes like: gmail_signature, gmail_extra, gmail_quote, gmail_default...
# Just elide them all except for 'gmail_default' elided = doc.css(".gmail_signature, .gmail_extra").remove
elided = doc.css("*[class^='gmail_']:not([class*='gmail_default'])").remove
to_markdown(doc.to_html, elided.to_html) to_markdown(doc.to_html, elided.to_html)
end end

2
spec/fixtures/emails/gmail_html_reply.eml vendored
View File

@@ -11,7 +11,7 @@ Content-Transfer-Encoding: quoted-printable
<div dir="auto"> <div dir="auto">
<p>This is a <b>GMAIL</b> reply ;)</p> <p>This is a <b>GMAIL</b> reply ;)</p>
</div> </div>
<div class="gmail_quote"> <div class="gmail_signature">
<p>This is the <i>elided</i> part!</p> <p>This is the <i>elided</i> part!</p>
</div> </div>
</div> </div>