Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Don't send SystemMessage::GroupNameChanged in unencrypted groups

Browse Source 
Unencrypted groups are usually ones with other MUAs which don't understand Delta Chat system
messages and show them as weird emails.
This commit is contained in:
iequidoo
2025-06-23 13:29:39 -03:00
parent 919b44fb3e
commit 3627027236
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/chat.rs
View File

@@ -4235,11 +4235,16 @@ async fn rename_ex(
(new_name.to_string(), chat_id),
)
.await?;
if chat.is_promoted()
&& !chat.is_mailing_list()
&& chat.typ != Chattype::Broadcast
&& sanitize_single_line(&chat.name) != new_name
if !chat.is_promoted()
|| chat.is_mailing_list()
|| chat.typ == Chattype::Broadcast
|| sanitize_single_line(&chat.name) == new_name
{
} else if chat.grpid.is_empty() {
chat_id
.update_timestamp(context, Param::GroupNameTimestamp, smeared_time(context))
.await?;
} else {
msg.viewtype = Viewtype::Text;
msg.text =
stock_str::msg_grp_name(context, &chat.name, &new_name, ContactId::SELF).await;

37
src/receive_imf/receive_imf_tests.rs
View File

@@ -4455,6 +4455,43 @@ async fn test_mua_can_readd() -> Result<()> {
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_rename_unencrypted_group() -> Result<()> {
let mut tcm = TestContextManager::new();
let alice = &tcm.alice().await;
let bob = &tcm.bob().await;
for ctx in [alice, bob] {
receive_imf(
ctx,
b"Subject: Some thread\r\n\
From: alice@example.org\r\n\
To: <bob@example.net>, <claire@example.org> \r\n\
Date: Mon, 12 Dec 2022 14:30:39 +0000\r\n\
Message-ID: <Mr.alices_original_mail@example.org>\r\n\
Chat-Version: 1.0\r\n\
\r\n\
Hi!\r\n",
false,
)
.await?
.unwrap();
}
let msg = alice.get_last_msg().await;
let alice_chat = Chat::load_from_db(alice, msg.chat_id).await?;
assert_eq!(alice_chat.typ, Chattype::Group);
SystemTime::shift(Duration::from_secs(60));
chat::set_chat_name(alice, alice_chat.id, "Renamed thread").await?;
assert!(!alice.sql.exists("SELECT COUNT(*) FROM smtp", ()).await?);
let sent_msg = alice.send_text(alice_chat.id, "I renamed the thread").await;
let msg = bob.recv_msg(&sent_msg).await;
let bob_chat = Chat::load_from_db(bob, msg.chat_id).await?;
assert_eq!(bob_chat.get_name(), "Renamed thread");
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_member_left_does_not_create_chat() -> Result<()> {
let mut tcm = TestContextManager::new();