feat: Use spaced em dash to separate message Subject from text

Using spaced en dash for this is typographically incorrect in some languages (e.g. in Russian). Also
using spaced en dash looks like adding a break in a sentence for many languages, this may be
confusing, particularly if the message text itself contains such breaks. We're actually joining two
different texts, so it's better to make a break between them stronger.

Author: iequidoo

python/tests/test_1_online.py

@@ -968,7 +968,7 @@ def test_dont_show_emails(acfactory, lp):
     msg = fresh_msgs[0]
     chat_msgs = msg.chat.get_messages()
     assert len(chat_msgs) == 1
-    assert any(msg.text == "subj – Actually interesting message in Spam" for msg in chat_msgs)
+    assert any(msg.text == "subj — Actually interesting message in Spam" for msg in chat_msgs)
 
     assert not any("unknown.address" in c.get_name() for c in ac1.get_chats())
     ac1.direct_imap.select_folder("Spam")
@@ -983,7 +983,7 @@ def test_dont_show_emails(acfactory, lp):
     ac1.start_io()
     msg2 = ac1._evtracker.wait_next_messages_changed()
 
-    assert msg2.text == "subj – message in Drafts received later"
+    assert msg2.text == "subj — message in Drafts received later"
     assert len(msg.chat.get_messages()) == 2
 
 

src/decrypt.rs

@@ -179,7 +179,7 @@ mod tests {
         receive_imf(&bob, attachment_mime, false).await?;
         let msg = bob.get_last_msg().await;
         // Subject should be prepended because the attachment doesn't have "Chat-Version".
-        assert_eq!(msg.text, "Hello, Bob! – Hello from Thunderbird!");
+        assert_eq!(msg.text, "Hello, Bob! — Hello from Thunderbird!");
 
         Ok(())
     }

src/mimeparser.rs

@@ -854,7 +854,7 @@ impl MimeMessage {
                         .iter_mut()
                         .find(|part| !part.msg.is_empty() && !part.is_reaction);
                     if let Some(part) = part_with_text {
-                        part.msg = format!("{} – {}", subject, part.msg);
+                        part.msg = format!("{} — {}", subject, part.msg);
                     }
                 }
             }

src/mimeparser/mimeparser_tests.rs

@@ -763,7 +763,7 @@ MDYyMDYxNTE1RTlDOEE4Cj4+CnN0YXJ0eHJlZgo4Mjc4CiUlRU9GCg==
 
     assert_eq!(message.parts.len(), 1);
     assert_eq!(message.parts[0].typ, Viewtype::File);
-    assert_eq!(message.parts[0].msg, "Mail with inline attachment – Hello!");
+    assert_eq!(message.parts[0].msg, "Mail with inline attachment — Hello!");
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -846,7 +846,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAeCAAAAABoYUP1AAAAAXNSR0IArs4c6QAAAo1JREFUKJFdkdFu
 
     assert_eq!(message.parts.len(), 1);
     assert_eq!(message.parts[0].typ, Viewtype::Image);
-    assert_eq!(message.parts[0].msg, "example – Test");
+    assert_eq!(message.parts[0].msg, "example — Test");
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -910,7 +910,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAeCAAAAABoYUP1AAAAAXNSR0IArs4c6QAAAo1JREFUKJFdkdFu
 
     assert_eq!(message.parts.len(), 1);
     assert_eq!(message.parts[0].typ, Viewtype::Image);
-    assert_eq!(message.parts[0].msg, "Test subject – Test");
+    assert_eq!(message.parts[0].msg, "Test subject — Test");
 }
 
 // Outlook specifies filename in the "name" attribute of Content-Type
@@ -976,7 +976,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAeCAAAAABoYUP1AAAAAXNSR0IArs4c6QAAAo1JREFUKJFdkdFu
 
     assert_eq!(message.parts.len(), 1);
     assert_eq!(message.parts[0].typ, Viewtype::Image);
-    assert_eq!(message.parts[0].msg, "Delta Chat is great stuff! – Test");
+    assert_eq!(message.parts[0].msg, "Delta Chat is great stuff! — Test");
 }
 
 #[test]
@@ -1199,7 +1199,7 @@ async fn test_add_subj_to_multimedia_msg() {
     let msg_id = chats.get_msg_id(0).unwrap().unwrap();
     let msg = Message::load_from_db(&t.ctx, msg_id).await.unwrap();
 
-    assert_eq!(msg.text, "subj with important info – body text");
+    assert_eq!(msg.text, "subj with important info — body text");
     assert_eq!(msg.viewtype, Viewtype::Image);
     assert_eq!(msg.error(), None);
     assert_eq!(msg.is_dc_message, MessengerMessage::No);
@@ -1233,7 +1233,7 @@ async fn test_mime_modified_alt_plain_html() {
     assert!(mimeparser.is_mime_modified);
     assert_eq!(
         mimeparser.parts[0].msg,
-        "mime-modified test – this is plain"
+        "mime-modified test — this is plain"
     );
 }
 
@@ -1245,7 +1245,7 @@ async fn test_mime_modified_alt_plain() {
     assert!(!mimeparser.is_mime_modified);
     assert_eq!(
         mimeparser.parts[0].msg,
-        "mime-modified test – \
+        "mime-modified test — \
         mime-modified should not be set set as there is no html and no special stuff;\n\
         although not being a delta-message.\n\
         test some special html-characters as < > and & but also \" and ' :)"
@@ -1260,7 +1260,7 @@ async fn test_mime_modified_alt_html() {
     assert!(mimeparser.is_mime_modified);
     assert_eq!(
         mimeparser.parts[0].msg,
-        "mime-modified test – mime-modified *set*; simplify is always regarded as lossy."
+        "mime-modified test — mime-modified *set*; simplify is always regarded as lossy."
     );
 }
 
@@ -1272,7 +1272,7 @@ async fn test_mime_modified_html() {
     assert!(mimeparser.is_mime_modified);
     assert_eq!(
         mimeparser.parts[0].msg,
-        "mime-modified test – mime-modified *set*; simplify is always regarded as lossy."
+        "mime-modified test — mime-modified *set*; simplify is always regarded as lossy."
     );
 }
 
@@ -1614,7 +1614,7 @@ async fn test_receive_eml() -> Result<()> {
     );
     assert_eq!(
         mime_message.parts[0].msg,
-        "this is a classic email – I attached the .EML file".to_string()
+        "this is a classic email — I attached the .EML file".to_string()
     );
     assert_eq!(
         mime_message.parts[0].param.get(Param::Filename),
@@ -1713,7 +1713,7 @@ async fn test_tlsrpt() -> Result<()> {
     assert_eq!(msg.parts[0].typ, Viewtype::File);
     assert_eq!(
         msg.parts[0].msg,
-        "Report Domain: nine.testrun.org Submitter: google.com Report-ID: <[email protected]> – This is an aggregate TLS report from google.com"
+        "Report Domain: nine.testrun.org Submitter: google.com Report-ID: <[email protected]> — This is an aggregate TLS report from google.com"
     );
 
     Ok(())
@@ -1774,7 +1774,7 @@ Content-Type: text/plain; charset=utf-8
 
     assert_eq!(message.parts.len(), 1);
     assert_eq!(message.parts[0].typ, Viewtype::Text);
-    // Not "Some subject – /help"
+    // Not "Some subject — /help"
     assert_eq!(message.parts[0].msg, "/help");
 }