Skip to content

Commit 07de9ac

Browse files
committed
feat: Don't put text into post-message
This way, there will be no duplicate text if a chat partner is using an older DC version. If the chat partner is using a new DC version, then this will have no effect.
1 parent 702771f commit 07de9ac

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

src/mimefactory.rs

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,19 +1869,23 @@ impl MimeFactory {
18691869

18701870
let footer = if is_reaction { "" } else { &self.selfstatus };
18711871

1872-
let message_text = format!(
1873-
"{}{}{}{}{}{}",
1874-
fwdhint.unwrap_or_default(),
1875-
quoted_text.unwrap_or_default(),
1876-
escape_message_footer_marks(final_text),
1877-
if !final_text.is_empty() && !footer.is_empty() {
1878-
"\r\n\r\n"
1879-
} else {
1880-
""
1881-
},
1882-
if !footer.is_empty() { "-- \r\n" } else { "" },
1883-
footer
1884-
);
1872+
let message_text = if self.pre_message_mode == Some(PreMessageMode::PostMessage) {
1873+
"".to_string()
1874+
} else {
1875+
format!(
1876+
"{}{}{}{}{}{}",
1877+
fwdhint.unwrap_or_default(),
1878+
quoted_text.unwrap_or_default(),
1879+
escape_message_footer_marks(final_text),
1880+
if !final_text.is_empty() && !footer.is_empty() {
1881+
"\r\n\r\n"
1882+
} else {
1883+
""
1884+
},
1885+
if !footer.is_empty() { "-- \r\n" } else { "" },
1886+
footer
1887+
)
1888+
};
18851889

18861890
let mut main_part = MimePart::new("text/plain", message_text);
18871891
if is_reaction {

0 commit comments

Comments
 (0)