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

fix: Actually send broadcast message to recipients, ALL TESTS PASS NOW - fix test_broadcasts_name_and_avatar().

Browse Source
This commit is contained in:
Hocuri
2025-08-04 17:16:54 +02:00
parent 6012595f1a
commit 91110147c3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat/chat_tests.rs
View File

@@ -2800,7 +2800,6 @@ async fn test_broadcasts_name_and_avatar() -> Result<()> {
let alice = &tcm.alice().await; let alice = &tcm.alice().await;
alice.set_config(Config::Displayname, Some("Alice")).await?; alice.set_config(Config::Displayname, Some("Alice")).await?;
let bob = &tcm.bob().await; let bob = &tcm.bob().await;
let alice_bob_contact_id = alice.add_or_lookup_contact_id(bob).await;
tcm.section("Create a broadcast channel"); tcm.section("Create a broadcast channel");
let alice_chat_id = create_broadcast(alice, "My Channel".to_string()).await?; let alice_chat_id = create_broadcast(alice, "My Channel".to_string()).await?;
@@ -2815,7 +2814,8 @@ async fn test_broadcasts_name_and_avatar() -> Result<()> {
assert_eq!(sent.recipients, "alice@example.org"); assert_eq!(sent.recipients, "alice@example.org");
tcm.section("Add a contact to the chat and send a message"); tcm.section("Add a contact to the chat and send a message");
add_contact_to_chat(alice, alice_chat_id, alice_bob_contact_id).await?; let qr = get_securejoin_qr(alice, Some(alice_chat_id)).await.unwrap();
tcm.exec_securejoin_qr(bob, alice, &qr).await;
let sent = alice.send_text(alice_chat_id, "Hi somebody").await; let sent = alice.send_text(alice_chat_id, "Hi somebody").await;
assert_eq!(sent.recipients, "bob@example.net alice@example.org"); assert_eq!(sent.recipients, "bob@example.net alice@example.org");

10
src/mimefactory.rs
View File

@@ -231,9 +231,6 @@ impl MimeFactory {
// Do not encrypt messages to mailing lists. // Do not encrypt messages to mailing lists.
encryption_keys = None; encryption_keys = None;
} else if chat.is_out_broadcast() {
// Encrypt, but only symmetrically, not with the public keys.
encryption_keys = Some(Vec::new());
} else { } else {
let email_to_remove = if msg.param.get_cmd() == SystemMessage::MemberRemovedFromGroup { let email_to_remove = if msg.param.get_cmd() == SystemMessage::MemberRemovedFromGroup {
msg.param.get(Param::Arg) msg.param.get(Param::Arg)
@@ -332,7 +329,7 @@ impl MimeFactory {
if let Some(public_key) = public_key_opt { if let Some(public_key) = public_key_opt {
keys.push((addr.clone(), public_key)) keys.push((addr.clone(), public_key))
} else if id != ContactId::SELF { } else if id != ContactId::SELF && !chat.is_any_broadcast() {
missing_key_addresses.insert(addr.clone()); missing_key_addresses.insert(addr.clone());
if is_encrypted { if is_encrypted {
warn!(context, "Missing key for {addr}"); warn!(context, "Missing key for {addr}");
@@ -353,7 +350,7 @@ impl MimeFactory {
if let Some(public_key) = public_key_opt { if let Some(public_key) = public_key_opt {
keys.push((addr.clone(), public_key)) keys.push((addr.clone(), public_key))
} else if id != ContactId::SELF { } else if id != ContactId::SELF && !chat.is_any_broadcast() {
missing_key_addresses.insert(addr.clone()); missing_key_addresses.insert(addr.clone());
if is_encrypted { if is_encrypted {
warn!(context, "Missing key for {addr}"); warn!(context, "Missing key for {addr}");
@@ -420,6 +417,9 @@ impl MimeFactory {
encryption_keys = if !is_encrypted { encryption_keys = if !is_encrypted {
None None
} else if chat.is_out_broadcast() {
// Encrypt, but only symmetrically, not with the public keys.
Some(Vec::new())
} else { } else {
if keys.is_empty() && !recipients.is_empty() { if keys.is_empty() && !recipients.is_empty() {
bail!( bail!(