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

fix: Make clicking on broadcast member-added messages work always (#7882)

Browse Source 
fix #7876
This commit is contained in:
Hocuri
2026-02-23 15:44:52 +01:00
committed by GitHub
parent 0e7f3c8238
commit cdb0e0ce29
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deltachat-rpc-client/tests/test_securejoin.py
View File

@@ -170,6 +170,7 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online):
member_added_msg = chat_msgs.pop(0).get_snapshot() member_added_msg = chat_msgs.pop(0).get_snapshot()
if inviter_side: if inviter_side:
assert member_added_msg.text == f"Member {contact_snapshot.display_name} added." assert member_added_msg.text == f"Member {contact_snapshot.display_name} added."
assert member_added_msg.info_contact_id == contact_snapshot.id
else: else:
assert member_added_msg.text == "You joined the channel." assert member_added_msg.text == "You joined the channel."
assert member_added_msg.is_info assert member_added_msg.is_info

5
src/receive_imf.rs
View File

@@ -3716,6 +3716,7 @@ async fn apply_out_broadcast_changes(
let mut send_event_chat_modified = false; let mut send_event_chat_modified = false;
let mut better_msg = None; let mut better_msg = None;
let mut added_removed_id: Option<ContactId> = None;
if from_id == ContactId::SELF { if from_id == ContactId::SELF {
apply_chat_name_avatar_and_description_changes( apply_chat_name_avatar_and_description_changes(
@@ -3748,6 +3749,7 @@ async fn apply_out_broadcast_changes(
stock_str::msg_add_member_local(context, added_id, ContactId::UNDEFINED) stock_str::msg_add_member_local(context, added_id, ContactId::UNDEFINED)
.await; .await;
better_msg.get_or_insert(msg); better_msg.get_or_insert(msg);
added_removed_id = Some(added_id);
send_event_chat_modified = true; send_event_chat_modified = true;
} }
} else { } else {
@@ -3772,6 +3774,7 @@ async fn apply_out_broadcast_changes(
better_msg.get_or_insert( better_msg.get_or_insert(
stock_str::msg_del_member_local(context, removed_id, ContactId::SELF).await, stock_str::msg_del_member_local(context, removed_id, ContactId::SELF).await,
); );
added_removed_id = Some(removed_id);
} }
} }
@@ -3781,7 +3784,7 @@ async fn apply_out_broadcast_changes(
} }
Ok(GroupChangesInfo { Ok(GroupChangesInfo {
better_msg, better_msg,
added_removed_id: None, added_removed_id,
silent: false, silent: false,
extra_msgs: vec![], extra_msgs: vec![],
}) })