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

fix: Only omit group changes messages if SELF is really added (#7220)

Browse Source 
If a self-addition message is received, but we're already in the group, there must be no hidden
member changes.
This commit is contained in:
iequidoo
2025-09-28 13:41:35 -03:00
committed by iequidoo
parent 1bb966e5a8
commit 6a7466df93
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/receive_imf.rs
View File

@@ -3078,7 +3078,9 @@ async fn apply_group_changes(
if let Some(removed_id) = removed_id {
removed_ids.remove(&removed_id);
}
let group_changes_msgs = if self_added {
let group_changes_msgs = if !chat_contacts.contains(&ContactId::SELF)
&& new_chat_contacts.contains(&ContactId::SELF)
{
Vec::new()
} else {
group_changes_msgs(context, &added_ids, &removed_ids, chat.id).await?

7
src/tests/verified_chats.rs
View File

@@ -783,7 +783,12 @@ async fn test_verified_chat_editor_reordering() -> Result<()> {
tcm.section("Charlie receives member added message");
charlie.recv_msg(&sent_member_added_msg).await;
charlie
.golden_test_chat(
charlie_received_xdc.chat_id,
"verified_chats_editor_reordering",
)
.await;
Ok(())
}

11
test-data/golden/verified_chats_editor_reordering Normal file
View File

@@ -0,0 +1,11 @@
Group#Chat#11: Group [3 member(s)] 🛡️
--------------------------------------------------------------------------------
Msg#11: info (Contact#Contact#Info): alice@example.org invited you to join this group.
Waiting for the device of alice@example.org to reply… [NOTICED][INFO]
Msg#13: info (Contact#Contact#Info): alice@example.org replied, waiting for being added to the group… [NOTICED][INFO]
Msg#16🔒: (Contact#Contact#11): [FRESH]
Msg#18: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO 🛡️]
Msg#19: info (Contact#Contact#Info): Member bob@example.net added. [NOTICED][INFO]
Msg#20🔒: (Contact#Contact#10): Member Me added by alice@example.org. [FRESH][INFO]
--------------------------------------------------------------------------------