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: Don't set is_bot for webxdc status updates (#5445)

Browse Source 
Webxdc status update messages are always "Auto-Submitted: auto-generated", so they must be excluded
for is_bot flag calculation.
This commit is contained in:
iequidoo
2024-04-18 03:28:38 -03:00
committed by iequidoo
parent 17701b78d6
commit 92bf48684a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mimeparser.rs
View File

@@ -494,7 +494,7 @@ impl MimeMessage {
}, },
}; };
if parser.mdn_reports.is_empty() { if parser.mdn_reports.is_empty() && parser.webxdc_status_update.is_none() {
// "Auto-Submitted" is also set by holiday-notices so we also check "chat-version". // "Auto-Submitted" is also set by holiday-notices so we also check "chat-version".
let is_bot = parser.headers.get("auto-submitted") let is_bot = parser.headers.get("auto-submitted")
== Some(&"auto-generated".to_string()) == Some(&"auto-generated".to_string())

5
src/webxdc.rs
View File

@@ -2672,6 +2672,8 @@ sth_for_the = "future""#
Ok(()) Ok(())
} }
// NB: This test also checks that a contact is not marked as bot after receiving from it a
// webxdc instance and status updates.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_status_update_vs_delete_device_after() -> Result<()> { async fn test_status_update_vs_delete_device_after() -> Result<()> {
let alice = &TestContext::new_alice().await; let alice = &TestContext::new_alice().await;
@@ -2681,6 +2683,7 @@ sth_for_the = "future""#
let alice_chat = alice.create_chat(bob).await; let alice_chat = alice.create_chat(bob).await;
let alice_instance = send_webxdc_instance(alice, alice_chat.id).await?; let alice_instance = send_webxdc_instance(alice, alice_chat.id).await?;
let bob_instance = bob.recv_msg(&alice.pop_sent_msg().await).await; let bob_instance = bob.recv_msg(&alice.pop_sent_msg().await).await;
assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);
SystemTime::shift(Duration::from_secs(1800)); SystemTime::shift(Duration::from_secs(1800));
let mut update = Message { let mut update = Message {
@@ -2697,11 +2700,13 @@ sth_for_the = "future""#
update.set_quote(alice, Some(&alice_instance)).await?; update.set_quote(alice, Some(&alice_instance)).await?;
let sent_msg = alice.send_msg(alice_chat.id, &mut update).await; let sent_msg = alice.send_msg(alice_chat.id, &mut update).await;
bob.recv_msg_trash(&sent_msg).await; bob.recv_msg_trash(&sent_msg).await;
assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);
assert_eq!( assert_eq!(
bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0)) bob.get_webxdc_status_updates(bob_instance.id, StatusUpdateSerial(0))
.await?, .await?,
r#"[{"payload":{"foo":"bar"},"serial":1,"max_serial":1}]"# r#"[{"payload":{"foo":"bar"},"serial":1,"max_serial":1}]"#
); );
assert_eq!(bob.add_or_lookup_contact(alice).await.is_bot(), false);
SystemTime::shift(Duration::from_secs(2700)); SystemTime::shift(Duration::from_secs(2700));
ephemeral::delete_expired_messages(bob, tools::time()).await?; ephemeral::delete_expired_messages(bob, tools::time()).await?;