Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 02:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Don't show a weird 'vb-request-with-auth' message when a subscriber joins

Browse Source
This commit is contained in:
Hocuri
2025-08-04 17:17:18 +02:00
parent 9474fbff56
commit a14b53e3ca
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat/chat_tests.rs
View File

@@ -2893,8 +2893,6 @@ async fn test_broadcast_joining_golden() -> Result<()> {
let qr = get_securejoin_qr(alice, Some(alice_chat_id)).await.unwrap();
let bob_chat_id = tcm.exec_securejoin_qr(bob, alice, &qr).await;
// TODO it's not nice that it says 'you added member bob'
// and 'Secure-Join: vb-request-with-auth'
alice
.golden_test_chat(alice_chat_id, "test_broadcast_joining_golden_alice")
.await;

13
src/securejoin.rs
View File

@@ -445,16 +445,9 @@ pub(crate) async fn handle_securejoin_handshake(
.await?;
inviter_progress(context, contact_id, 800);
inviter_progress(context, contact_id, 1000);
if step.starts_with("vb-") {
// For broadcasts, we don't want to delete the message,
// because the other device should also internally add the member
// and see the key (because it won't see the member via autocrypt-gossip).
Ok(HandshakeMessage::Propagate)
} else {
// IMAP-delete the message to avoid handling it by another device and adding the
// member twice. Another device will know the member's key from Autocrypt-Gossip.
Ok(HandshakeMessage::Done)
}
// IMAP-delete the message to avoid handling it by another device and adding the
// member twice. Another device will know the member's key from Autocrypt-Gossip.
Ok(HandshakeMessage::Done)
} else {
// Setup verified contact.
secure_connection_established(

1
test-data/golden/test_broadcast_joining_golden_alice
View File

@@ -2,5 +2,4 @@ OutBroadcast#Chat#10: My Channel [1 member(s)] Icon: e9b6c7a78aa2e4f415644f55a55
--------------------------------------------------------------------------------
Msg#10🔒: Me (Contact#Contact#Self): You changed the group image. [INFO] √
Msg#12🔒: Me (Contact#Contact#Self): Member bob@example.net added. [INFO] √
Msg#13🔒: (Contact#Contact#10): Secure-Join: vb-request-with-auth [FRESH]
--------------------------------------------------------------------------------