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

fix the remaining case

Browse Source
This commit is contained in:
Hocuri
2025-11-14 14:32:34 +01:00
parent d7ada8affa
commit c64e4c7f8c
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/securejoin/bob.rs
View File

@@ -158,8 +158,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
QrInvite::Contact { .. } => { QrInvite::Contact { .. } => {
// For setup-contact the BobState already ensured the 1:1 chat exists because it // For setup-contact the BobState already ensured the 1:1 chat exists because it
// uses it to send the handshake messages. // uses it to send the handshake messages.
// Calculate the sort timestamp before checking the chat protection status so that if we // Use calc_sort_timestamp() to make sure that the new message is the last message in the chat.
// race with its change, we don't add our message below the protection message.
let sort_to_bottom = true; let sort_to_bottom = true;
let (received, incoming) = (false, false); let (received, incoming) = (false, false);
let ts_sort = private_chat_id let ts_sort = private_chat_id
@@ -244,9 +243,9 @@ pub(super) async fn handle_auth_required(
// so only show it when joining a group and not for a 1:1 chat or broadcast channel. // so only show it when joining a group and not for a 1:1 chat or broadcast channel.
let contact_id = invite.contact_id(); let contact_id = invite.contact_id();
let msg = stock_str::secure_join_replies(context, contact_id).await; let msg = stock_str::secure_join_replies(context, contact_id).await;
let timestamp = message.timestamp_sent; let timestamp = smeared_time(context);
let chat_id = joining_chat_id(context, &invite, chat_id, timestamp).await?; let chat_id = joining_chat_id(context, &invite, chat_id, timestamp).await?;
chat::add_info_msg(context, chat_id, &msg, time()).await?; chat::add_info_msg(context, chat_id, &msg, timestamp).await?;
} }
} }

2
test-data/golden/two_group_securejoins
View File

@@ -1,9 +1,9 @@
Group#Chat#6002: Group [3 member(s)] Group#Chat#6002: Group [3 member(s)]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Msg#6006: info (Contact#Contact#Info): alice@example.org replied, waiting for being added to the group… [NOTICED][INFO]
Msg#6003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] Msg#6003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
Msg#6004: info (Contact#Contact#Info): alice@example.org invited you to join this group. Msg#6004: 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] Waiting for the device of alice@example.org to reply… [NOTICED][INFO]
Msg#6006: info (Contact#Contact#Info): alice@example.org replied, waiting for being added to the group… [NOTICED][INFO]
Msg#6008🔒: (Contact#Contact#6001): Member Me added by alice@example.org. [FRESH][INFO] Msg#6008🔒: (Contact#Contact#6001): Member Me added by alice@example.org. [FRESH][INFO]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
test-data/golden/verified_chats_editor_reordering
View File

@@ -1,10 +1,10 @@
Group#Chat#3002: Group [3 member(s)] Group#Chat#3002: Group [3 member(s)]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Msg#3006: info (Contact#Contact#Info): alice@example.org replied, waiting for being added to the group… [NOTICED][INFO]
Msg#3003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] Msg#3003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
Msg#3004: info (Contact#Contact#Info): alice@example.org invited you to join this group. Msg#3004: 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] Waiting for the device of alice@example.org to reply… [NOTICED][INFO]
Msg#3006: info (Contact#Contact#Info): alice@example.org replied, waiting for being added to the group… [NOTICED][INFO]
Msg#3008🔒: (Contact#Contact#3002): [FRESH] Msg#3008🔒: (Contact#Contact#3002): [FRESH]
Msg#3009: info (Contact#Contact#Info): Member bob@example.net added. [NOTICED][INFO] Msg#3009: info (Contact#Contact#Info): Member bob@example.net added. [NOTICED][INFO]
Msg#3010🔒: (Contact#Contact#3001): Member Me added by alice@example.org. [FRESH][INFO] Msg#3010🔒: (Contact#Contact#3001): Member Me added by alice@example.org. [FRESH][INFO]