Fix original message test case

crisp-oss · Jul 15, 2024 · 0b5fd0f · 0b5fd0f
1 parent ef3c626
commit 0b5fd0f
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 4 deletions.
diff --git a/lib/regex.js b/lib/regex.js
@@ -27,7 +27,8 @@ class RegexList {
       /^\s*([a-z]{3,4}\.\s[\s\S]+\sskrev\s[\s\S]+:)$/m, // DATE skrev NAME <EMAIL>:
       /^([0-9]{2}).([0-9]{2}).(20[0-9]{2})(.*)(([0-9]{2}).([0-9]{2}))(.*)\"( *)<(.*)>( *):$/m, // DD.MM.20YY HH:II NAME <EMAIL>
       /^[0-9]{2}:[0-9]{2}(.*)[0-9]{4}(.*)\"( *)<(.*)>( *):$/, // HH:II, DATE, NAME <EMAIL>:
-      /^(.*)[0-9]{4}(.*)from(.*)<(.*)>:$/
+      /^(.*)[0-9]{4}(.*)from(.*)<(.*)>:$/,
+      /^-{1,10} ?(O|o)riginal (M|m)essage ?-{1,10}$/i,
     ]);
 
     this.signatureRegex = this.buildRe2([
@@ -38,7 +39,6 @@ class RegexList {
       /^\+{2,4}$/, // Separator
       /^\={2,4}$/, // Separator
       /^________________________________$/, // Separator
-      /^-{1,10}Original message-{1,10}$/,
       /^Sent from (?:\s*.+)$/, // en
       /^Get Outlook for (?:\s*.+).*/m, // en
       /^Cheers,?!?$/mi, // en

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/fixtures/email_original_message.txt b/test/fixtures/email_original_message.txt
@@ -0,0 +1,12 @@
+Fusce bibendum, quam hendrerit sagittis tempor, dui turpis tempus erat, pharetra sodales ante sem sit amet metus.
+Nulla malesuada, orci non vulputate lobortis, massa felis pharetra ex, convallis consectetur ex libero eget ante.
+Nam vel turpis posuere, rhoncus ligula in, venenatis orci. Duis interdum venenatis ex a rutrum.
+Duis ut libero eu lectus consequat consequat ut vel lorem. Vestibulum convallis lectus urna,
+et mollis ligula rutrum quis. Fusce sed odio id arcu varius aliquet nec nec nibh.
+
+-----original message-----
+
+Hi John,
+
+I'd like to revisit the proposal I previously shared with you regarding a
+potential collaboration.
diff --git a/test/fixtures/email_original_message_2.txt b/test/fixtures/email_original_message_2.txt
@@ -0,0 +1,12 @@
+Fusce bibendum, quam hendrerit sagittis tempor, dui turpis tempus erat, pharetra sodales ante sem sit amet metus.
+Nulla malesuada, orci non vulputate lobortis, massa felis pharetra ex, convallis consectetur ex libero eget ante.
+Nam vel turpis posuere, rhoncus ligula in, venenatis orci. Duis interdum venenatis ex a rutrum.
+Duis ut libero eu lectus consequat consequat ut vel lorem. Vestibulum convallis lectus urna,
+et mollis ligula rutrum quis. Fusce sed odio id arcu varius aliquet nec nec nibh.
+
+----- Original Message -----
+
+Hi John,
+
+I'd like to revisit the proposal I previously shared with you regarding a
+potential collaboration.
diff --git a/test/test.js b/test/test.js
@@ -469,5 +469,27 @@ exports.test_email_en_multiline_2 = function(test) {
 	test.equal(COMMON_FIRST_FRAGMENT, fragments[0].toString().trim());
 	test.equal(2, fragments.length);
 
+	test.done();
+}
+
+exports.test_email_original_message = function(test) {
+	let email = get_email("email_original_message");
+
+	let fragments = email.getFragments();
+
+	test.equal(COMMON_FIRST_FRAGMENT, fragments[0].toString().trim());
+	test.equal(2, fragments.length);
+
+	test.done();
+}
+
+exports.test_email_original_message_2 = function(test) {
+	let email = get_email("email_original_message_2");
+
+	let fragments = email.getFragments();
+
+	test.equal(COMMON_FIRST_FRAGMENT, fragments[0].toString().trim());
+	test.equal(2, fragments.length);
+
 	test.done();
 }