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

fix: only send Chat-Group-Member-Timestamps in groups

Browse Source
This commit is contained in:
link2xt
2025-01-24 21:18:56 +00:00
committed by l
parent 787f54feda
commit fc06351fa3
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/chat/chat_tests.rs
View File

@@ -2495,7 +2495,9 @@ async fn test_broadcast() -> Result<()> {
} }
{ {
let msg = bob.recv_msg(&alice.pop_sent_msg().await).await; let sent_msg = alice.pop_sent_msg().await;
assert!(!sent_msg.payload.contains("Chat-Group-Member-Timestamps:"));
let msg = bob.recv_msg(&sent_msg).await;
assert_eq!(msg.get_text(), "ola!"); assert_eq!(msg.get_text(), "ola!");
assert_eq!(msg.subject, "Broadcast list"); assert_eq!(msg.subject, "Broadcast list");
assert!(!msg.get_showpadlock()); // avoid leaking recipients in encryption data assert!(!msg.get_showpadlock()); // avoid leaking recipients in encryption data
@@ -3536,3 +3538,12 @@ async fn test_restore_backup_after_60_days() -> Result<()> {
Ok(()) Ok(())
} }
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_one_to_one_chat_no_group_member_timestamps() {
let t = TestContext::new_alice().await;
let chat = t.create_chat_with_contact("bob", "bob@example.com").await;
let sent = t.send_text(chat.id, "Hi!").await;
let payload = sent.payload;
assert!(!payload.contains("Chat-Group-Member-Timestamps:"));
}

35
src/mimefactory.rs
View File

@@ -622,24 +622,23 @@ impl MimeFactory {
); );
} }
let chat_memberlist_is_stale = if let Loaded::Message { chat, .. } = &self.loaded { if let Loaded::Message { chat, .. } = &self.loaded {
chat.member_list_is_stale(context).await? if chat.typ == Chattype::Group
} else { && !self.member_timestamps.is_empty()
false && !chat.member_list_is_stale(context).await?
}; {
headers.push(
if !self.member_timestamps.is_empty() && !chat_memberlist_is_stale { Header::new_with_value(
headers.push( "Chat-Group-Member-Timestamps".into(),
Header::new_with_value( self.member_timestamps
"Chat-Group-Member-Timestamps".into(), .iter()
self.member_timestamps .map(|ts| ts.to_string())
.iter() .collect::<Vec<String>>()
.map(|ts| ts.to_string()) .join(" "),
.collect::<Vec<String>>() )
.join(" "), .unwrap(),
) );
.unwrap(), }
);
} }
let subject_str = self.subject_str(context).await?; let subject_str = self.subject_str(context).await?;