Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved signature identifier.

Browse source
This commit is contained in:
Martin Edenhofer 2015-04-05 00:43:01 +02:00
parent 48c6b963fa
commit a13217e18b
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/app/lib/app_post/utils.js.coffee
View file

@ -225,7 +225,7 @@ class App.Utils
lineCount += 1
# Am 04.03.2015 um 12:47 schrieb Alf Aardvark:
if line && line.match( /^(Am)\s.{6,10}\s(um)\s.{3,10}\s(schrieb)\s.+?:/ )
if line && line.match( /^(Am)\s.{6,20}\s(um)\s.{3,10}\s(schrieb)\s.{1,250}:/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -235,7 +235,7 @@ class App.Utils
# Thunderbird default - http://kb.mozillazine.org/Reply_header_settings
# On 01-01-2007 11:00 AM, Alf Aardvark wrote:
if line && line.match( /^(On)\s.{6,10}\s.{3,10},\s.{1,100}(wrote):/ )
if line && line.match( /^(On)\s.{6,20}\s.{3,10},\s.{1,250}(wrote):/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -245,7 +245,7 @@ class App.Utils
# http://kb.mozillazine.org/Reply_header_settings
# Alf Aardvark wrote, on 01-01-2007 11:00 AM:
if line && line.match( /^.{1,100}\s(wrote),\son\s.{3,20}:/ )
if line && line.match( /^.{1,250}\s(wrote),\son\s.{3,20}:/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -261,7 +261,7 @@ class App.Utils
lineCount += 1
# On 01/04/15 10:55, Bob Smith wrote:
if line && line.match( /^(On)\s.{6,10}\s.{3,10}\s.+?\s(wrote):/ )
if line && line.match( /^(On)\s.{6,20}\s.{3,10}\s.{1,250}\s(wrote):/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -270,7 +270,7 @@ class App.Utils
return
# Am 03.04.2015 um 20:58 schrieb Martin Edenhofer <me@znuny.ink>:
if line && line.match( /^(Am)\s.{6,10}\s(um)\s.{3,10}\s(schrieb)\s.+?:/ )
if line && line.match( /^(Am)\s.{6,20}\s(um)\s.{3,10}\s(schrieb)\s.{1,250}:/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -286,7 +286,7 @@ class App.Utils
lineCount = 0
for line in textToSearchInLines
lineCount += 1
if line && line.match( /^..{6,10}\s.{3,10}\s-\s.+?\s(wrote|schrieb):/ )
if line && line.match( /^.{6,10}\s.{3,10}\s-\s.{1,250}\s(wrote|schrieb):/ )
marker =
line: cleanup(line)
lineCount: lineCount
@ -349,6 +349,13 @@ class App.Utils
if message.match( regex )
return message.replace( regex, "#{markerTemplate}\$1" )
# gmail
# <div class="ecxgmail_quote">
if !markers || !markers[0]
regex = new RegExp( "(<blockquote class=\"ecxgmail_quote\">)" )
if message.match( regex )
return message.replace( regex, "#{markerTemplate}\$1" )
# if no marker is found, return
return message if !markers || !markers[0]

11
public/assets/tests/html-utils.js
View file

@ -647,6 +647,17 @@ test( "identify signature", function() {
result = App.Utils.signatureIdentify( message, true )
equal( result, should )
// gmail
message = "<div>test 123 <br/><br/>--no not match--<br/><br/>Bob Smith<br/><blockquote class=\"ecxgmail_quote\">lalala</blockquote></div>"
should = "<div>test 123 <br/><br/>--no not match--<br/><br/>Bob Smith<br/><span class=\"js-signatureMarker\"></span><blockquote class=\"ecxgmail_quote\">lalala</blockquote></div>"
result = App.Utils.signatureIdentify( message, true )
equal( result, should )
message = "<div>test 123 <br/><br/>--no not match--<br/><br/>Bob Smith<br/>Am 24. Dezember 2015 um 07:45 schrieb kathrine &lt;kathrine@example.com&gt;:<br/>lalala</div>"
should = "<div>test 123 <br/><br/>--no not match--<br/><br/>Bob Smith<br/><span class=\"js-signatureMarker\"></span>Am 24. Dezember 2015 um 07:45 schrieb kathrine &lt;kathrine@example.com&gt;:<br/>lalala</div>"
result = App.Utils.signatureIdentify( message, true )
equal( result, should )
});
// replace tags