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

create_or_lookup_group: streamline group ID parsing

Browse Source
This commit is contained in:
Alexander Krotov
2020-06-08 08:14:21 +03:00
committed by link2xt
parent 4fdf496cac
commit 64ab955ad7
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/dc_receive_imf.rs
View File

@@ -914,32 +914,29 @@ async fn create_or_lookup_group(
} }
if grpid.is_empty() { if grpid.is_empty() {
if let Some(value) = mime_parser.get(HeaderDef::MessageId) { if let Some(extracted_grpid) = mime_parser
if let Some(extracted_grpid) = dc_extract_grpid_from_rfc724_mid(&value) { .get(HeaderDef::MessageId)
grpid = extracted_grpid.to_string(); .and_then(|value| dc_extract_grpid_from_rfc724_mid(&value))
} {
} grpid = extracted_grpid.to_string();
if grpid.is_empty() { } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) {
if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::InReplyTo) { grpid = extracted_grpid.to_string();
grpid = extracted_grpid.to_string(); } else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References) {
} else if let Some(extracted_grpid) = extract_grpid(mime_parser, HeaderDef::References) grpid = extracted_grpid.to_string();
{ } else {
grpid = extracted_grpid.to_string(); return create_or_lookup_adhoc_group(
} else { context,
return create_or_lookup_adhoc_group( mime_parser,
context, allow_creation,
mime_parser, create_blocked,
allow_creation, from_id,
create_blocked, to_ids,
from_id, )
to_ids, .await
) .map_err(|err| {
.await info!(context, "could not create adhoc-group: {:?}", err);
.map_err(|err| { err
info!(context, "could not create adhoc-group: {:?}", err); });
err
});
}
} }
} }
// now we have a grpid that is non-empty // now we have a grpid that is non-empty