mirror of
https://github.com/chatmail/core.git
synced 2026-04-17 21:46:35 +03:00
fix: do not put the status footer into reaction MIME parts
This commit is contained in:
@@ -1172,7 +1172,10 @@ impl<'a> MimeFactory<'a> {
|
|||||||
}
|
}
|
||||||
let flowed_text = format_flowed(final_text);
|
let flowed_text = format_flowed(final_text);
|
||||||
|
|
||||||
let footer = &self.selfstatus;
|
let is_reaction = self.msg.param.get_int(Param::Reaction).unwrap_or_default() != 0;
|
||||||
|
|
||||||
|
let footer = if is_reaction { "" } else { &self.selfstatus };
|
||||||
|
|
||||||
let message_text = format!(
|
let message_text = format!(
|
||||||
"{}{}{}{}{}{}",
|
"{}{}{}{}{}{}",
|
||||||
fwdhint.unwrap_or_default(),
|
fwdhint.unwrap_or_default(),
|
||||||
@@ -1195,7 +1198,7 @@ impl<'a> MimeFactory<'a> {
|
|||||||
))
|
))
|
||||||
.body(message_text);
|
.body(message_text);
|
||||||
|
|
||||||
if self.msg.param.get_int(Param::Reaction).unwrap_or_default() != 0 {
|
if is_reaction {
|
||||||
main_part = main_part.header(("Content-Disposition", "reaction"));
|
main_part = main_part.header(("Content-Disposition", "reaction"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -464,6 +464,16 @@ Content-Disposition: reaction\n\
|
|||||||
let alice = TestContext::new_alice().await;
|
let alice = TestContext::new_alice().await;
|
||||||
let bob = TestContext::new_bob().await;
|
let bob = TestContext::new_bob().await;
|
||||||
|
|
||||||
|
// Test that the status does not get mixed up into reactions.
|
||||||
|
alice
|
||||||
|
.set_config(
|
||||||
|
Config::Selfstatus,
|
||||||
|
Some("Buy Delta Chat today and make this banner go away!"),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
bob.set_config(Config::Selfstatus, Some("Sent from my Delta Chat Pro. 👍"))
|
||||||
|
.await?;
|
||||||
|
|
||||||
let chat_alice = alice.create_chat(&bob).await;
|
let chat_alice = alice.create_chat(&bob).await;
|
||||||
let alice_msg = alice.send_text(chat_alice.id, "Hi!").await;
|
let alice_msg = alice.send_text(chat_alice.id, "Hi!").await;
|
||||||
let bob_msg = bob.recv_msg(&alice_msg).await;
|
let bob_msg = bob.recv_msg(&alice_msg).await;
|
||||||
|
|||||||
Reference in New Issue
Block a user