Skip to content

Commit

Permalink
fix: use 0 timestamps if Chat-Group-Member-Timestamps is not set
Browse files Browse the repository at this point in the history
  • Loading branch information
link2xt committed Jan 25, 2025
1 parent fc06351 commit 104cc3a
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/receive_imf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2093,13 +2093,14 @@ async fn create_group(
}
members.extend(to_ids);

chat::add_to_chat_contacts_table(
context,
mime_parser.timestamp_sent,
new_chat_id,
&members,
)
.await?;
// Add all members with 0 timestamp
// because we don't know the real timestamp of their addition.
// This will allow other senders who support
// `Chat-Group-Member-Timestamps` to overwrite
// timestamps later.
let timestamp = 0;

chat::add_to_chat_contacts_table(context, timestamp, new_chat_id, &members).await?;
}

context.emit_event(EventType::ChatModified(new_chat_id));
Expand Down
66 changes: 66 additions & 0 deletions src/receive_imf/receive_imf_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5485,3 +5485,69 @@ async fn test_prefer_chat_group_id_over_references() -> Result<()> {
assert_ne!(chat1.id, chat2.id);
Ok(())
}

/// Tests that if member timestamps are unknown
/// because of the missing `Chat-Group-Member-Timestamps` header,
/// then timestamps default to zero.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_default_member_timestamps_to_zero() -> Result<()> {
let bob = &TestContext::new_bob().await;

let now = time();

let date = chrono::DateTime::<chrono::Utc>::from_timestamp(now - 1000, 0)
.unwrap()
.to_rfc2822();
let msg = receive_imf(
bob,
format!(
"Subject: Some group\r\n\
From: <[email protected]>\r\n\
To: <[email protected]>, <[email protected]>, <[email protected]>\r\n\
Date: {date}\r\n\
Message-ID: <first@localhost>\r\n\
Chat-Group-ID: foobarbaz12\n\
Chat-Group-Name: foo\n\
Chat-Version: 1.0\r\n\
\r\n\
Hi!\r\n"
)
.as_bytes(),
false,
)
.await?
.unwrap();
let chat = Chat::load_from_db(bob, msg.chat_id).await?;
assert_eq!(chat.typ, Chattype::Group);
assert_eq!(chat::get_chat_contacts(bob, chat.id).await?.len(), 4);

let date = chrono::DateTime::<chrono::Utc>::from_timestamp(now, 0)
.unwrap()
.to_rfc2822();
receive_imf(
bob,
format!(
"Subject: Some group\r\n\
From: <[email protected]>\r\n\
To: <[email protected]>, <[email protected]>\r\n\
Chat-Group-Past-Members: <[email protected]>\r\n\
Chat-Group-Member-Timestamps: 1737783000 1737783100 1737783200\r\n\
Chat-Group-ID: foobarbaz12\n\
Chat-Group-Name: foo\n\
Chat-Version: 1.0\r\n\
Date: {date}\r\n\
Message-ID: <second@localhost>\r\n\
\r\n\
Hi back!\r\n"
)
.as_bytes(),
false,
)
.await?
.unwrap();

let chat = Chat::load_from_db(bob, msg.chat_id).await?;
assert_eq!(chat.typ, Chattype::Group);
assert_eq!(chat::get_chat_contacts(bob, chat.id).await?.len(), 3);
Ok(())
}

0 comments on commit 104cc3a

Please sign in to comment.