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

refactor(receive_imf): only call create_or_lookup_group() with allow_creation=true

Browse Source
This commit is contained in:
link2xt
2024-05-19 22:03:27 +00:00
parent 7f2c8ff53d
commit e9cef4b0ba
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/receive_imf.rs
View File

@@ -834,18 +834,13 @@ async fn add_parts(
create_blocked_default create_blocked_default
}; };
if chat_id.is_none() { if chat_id.is_none() && (allow_creation || test_normal_chat.is_some()) {
// try to create a group // try to create a group
if let Some((new_chat_id, new_chat_id_blocked)) = create_or_lookup_group( if let Some((new_chat_id, new_chat_id_blocked)) = create_or_lookup_group(
context, context,
mime_parser, mime_parser,
is_partial_download.is_some(), is_partial_download.is_some(),
if test_normal_chat.is_none() {
allow_creation
} else {
true
},
create_blocked, create_blocked,
from_id, from_id,
to_ids, to_ids,
@@ -1104,12 +1099,11 @@ async fn add_parts(
} }
if !to_ids.is_empty() { if !to_ids.is_empty() {
if chat_id.is_none() { if chat_id.is_none() && allow_creation {
if let Some((new_chat_id, new_chat_id_blocked)) = create_or_lookup_group( if let Some((new_chat_id, new_chat_id_blocked)) = create_or_lookup_group(
context, context,
mime_parser, mime_parser,
is_partial_download.is_some(), is_partial_download.is_some(),
allow_creation,
Blocked::Not, Blocked::Not,
from_id, from_id,
to_ids, to_ids,
@@ -1826,12 +1820,10 @@ async fn is_probably_private_reply(
/// than two members, a new ad hoc group is created. /// than two members, a new ad hoc group is created.
/// ///
/// On success the function returns the found/created (chat_id, chat_blocked) tuple. /// On success the function returns the found/created (chat_id, chat_blocked) tuple.
#[allow(clippy::too_many_arguments)]
async fn create_or_lookup_group( async fn create_or_lookup_group(
context: &Context, context: &Context,
mime_parser: &mut MimeMessage, mime_parser: &mut MimeMessage,
is_partial_download: bool, is_partial_download: bool,
allow_creation: bool,
create_blocked: Blocked, create_blocked: Blocked,
from_id: ContactId, from_id: ContactId,
to_ids: &[ContactId], to_ids: &[ContactId],
@@ -1839,9 +1831,6 @@ async fn create_or_lookup_group(
) -> Result<Option<(ChatId, Blocked)>> { ) -> Result<Option<(ChatId, Blocked)>> {
let grpid = if let Some(grpid) = try_getting_grpid(mime_parser) { let grpid = if let Some(grpid) = try_getting_grpid(mime_parser) {
grpid grpid
} else if !allow_creation {
info!(context, "Creating ad-hoc group prevented from caller.");
return Ok(None);
} else if is_partial_download { } else if is_partial_download {
// Partial download may be an encrypted message with protected Subject header. // Partial download may be an encrypted message with protected Subject header.
// //
@@ -1920,11 +1909,6 @@ async fn create_or_lookup_group(
|| self_explicitly_added(context, &mime_parser).await?) || self_explicitly_added(context, &mime_parser).await?)
{ {
// Group does not exist but should be created. // Group does not exist but should be created.
if !allow_creation {
info!(context, "Creating group forbidden by caller.");
return Ok(None);
}
let grpname = mime_parser let grpname = mime_parser
.get_header(HeaderDef::ChatGroupName) .get_header(HeaderDef::ChatGroupName)
.context("Chat-Group-Name vanished")? .context("Chat-Group-Name vanished")?