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

fix: add Auto-Submitted header in a single place

Browse Source 
This ensures we don't add multiple Auto-Submitted headers
when bots send vg-request or vc-request messages.

The change fixes failing
receive_imf::tests::test_bot_accepts_another_group_after_qr_scan
test.
This commit is contained in:
link2xt
2024-08-26 23:29:34 +00:00
parent 099f0e2d18
commit 273158a337
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mimefactory.rs
View File

@@ -579,6 +579,16 @@ impl MimeFactory {
"Auto-Submitted".to_string(), "Auto-Submitted".to_string(),
"auto-generated".to_string(), "auto-generated".to_string(),
)); ));
} else if let Loaded::Message { msg, .. } = &self.loaded {
if msg.param.get_cmd() == SystemMessage::SecurejoinMessage {
let step = msg.param.get(Param::Arg).unwrap_or_default();
if step != "vg-request" && step != "vc-request" {
headers.push(Header::new(
"Auto-Submitted".to_string(),
"auto-replied".to_string(),
));
}
}
} }
if let Loaded::Message { chat, .. } = &self.loaded { if let Loaded::Message { chat, .. } = &self.loaded {
@@ -1192,12 +1202,6 @@ impl MimeFactory {
if let Some(id) = msg.param.get(Param::Arg4) { if let Some(id) = msg.param.get(Param::Arg4) {
headers.push(Header::new("Secure-Join-Group".into(), id.into())); headers.push(Header::new("Secure-Join-Group".into(), id.into()));
}; };
if step != "vg-request" && step != "vc-request" {
headers.push(Header::new(
"Auto-Submitted".to_string(),
"auto-replied".to_string(),
));
}
} }
} }
SystemMessage::ChatProtectionEnabled => { SystemMessage::ChatProtectionEnabled => {