mirror of
https://github.com/chatmail/core.git
synced 2026-04-26 01:46:34 +03:00
fix: no implicit member changes when we are added to the group (#6493)
This commit is contained in:
@@ -2456,7 +2456,11 @@ async fn apply_group_changes(
|
||||
if let Some(removed_id) = removed_id {
|
||||
removed_ids.remove(&removed_id);
|
||||
}
|
||||
let group_changes_msgs = group_changes_msgs(context, &added_ids, &removed_ids, chat_id).await?;
|
||||
let group_changes_msgs = if self_added {
|
||||
Vec::new()
|
||||
} else {
|
||||
group_changes_msgs(context, &added_ids, &removed_ids, chat_id).await?
|
||||
};
|
||||
|
||||
if let Some(avatar_action) = &mime_parser.group_avatar {
|
||||
if !new_chat_contacts.contains(&ContactId::SELF) {
|
||||
|
||||
@@ -5551,3 +5551,34 @@ async fn test_default_member_timestamps_to_zero() -> Result<()> {
|
||||
assert_eq!(chat::get_chat_contacts(bob, chat.id).await?.len(), 3);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Regression test for the bug
|
||||
/// that resulted in an info message
|
||||
/// about Bob addition to the group on Fiona's device.
|
||||
///
|
||||
/// There should be no info messages about implicit
|
||||
/// member changes when we are added to the group.
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn test_two_group_securejoins() -> Result<()> {
|
||||
let mut tcm = TestContextManager::new();
|
||||
let alice = &tcm.alice().await;
|
||||
let bob = &tcm.bob().await;
|
||||
let fiona = &tcm.fiona().await;
|
||||
|
||||
let group_id = chat::create_group_chat(alice, ProtectionStatus::Protected, "Group").await?;
|
||||
|
||||
let qr = get_securejoin_qr(alice, Some(group_id)).await?;
|
||||
|
||||
// Bob joins using QR code.
|
||||
tcm.exec_securejoin_qr(bob, alice, &qr).await;
|
||||
|
||||
// Fiona joins using QR code.
|
||||
tcm.exec_securejoin_qr(fiona, alice, &qr).await;
|
||||
|
||||
let fiona_chat_id = fiona.get_last_msg().await.chat_id;
|
||||
fiona
|
||||
.golden_test_chat(fiona_chat_id, "two_group_securejoins")
|
||||
.await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user