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

add some comment and remove some code after quick a/v with @r10s

Browse Source
This commit is contained in:
holger krekel
2019-12-09 21:45:01 +01:00
parent 4dc5e0378f
commit 17ce02a87c
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/dc_receive_imf.rs
View File

@@ -792,7 +792,6 @@ fn create_or_lookup_group(
to_ids: &ContactIds, to_ids: &ContactIds,
) -> Result<(u32, Blocked)> { ) -> Result<(u32, Blocked)> {
let mut chat_id_blocked = Blocked::Not; let mut chat_id_blocked = Blocked::Not;
let to_ids_cnt = to_ids.len();
let mut recreate_member_list = false; let mut recreate_member_list = false;
let mut send_EVENT_CHAT_MODIFIED = false; let mut send_EVENT_CHAT_MODIFIED = false;
let mut X_MrRemoveFromGrp = None; let mut X_MrRemoveFromGrp = None;
@@ -803,9 +802,9 @@ fn create_or_lookup_group(
if mime_parser.is_system_message == SystemMessage::LocationStreamingEnabled { if mime_parser.is_system_message == SystemMessage::LocationStreamingEnabled {
better_msg = better_msg =
context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", from_id as u32) context.stock_system_msg(StockMessage::MsgLocationEnabled, "", "", from_id as u32);
set_better_msg(mime_parser, &better_msg);
} }
set_better_msg(mime_parser, &better_msg);
let mut grpid = "".to_string(); let mut grpid = "".to_string();
if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupId) { if let Some(optional_field) = mime_parser.get(HeaderDef::ChatGroupId) {
@@ -840,6 +839,8 @@ fn create_or_lookup_group(
} }
} }
} }
// now we have a grpid that is non-empty
// but we might not know about this group
let grpname = mime_parser.get(HeaderDef::ChatGroupName).cloned(); let grpname = mime_parser.get(HeaderDef::ChatGroupName).cloned();
@@ -993,6 +994,18 @@ fn create_or_lookup_group(
}; };
} }
// We have a valid chat_id > DC_CHAT_ID_LAST_SPECIAL.
//
// However, it's possible that we got a non-DC message
// and the user hit "reply" instead of "reply-all".
// We heuristically detect this case and show
// a placeholder-system-message to warn about this
// and refer to "message-info" to see the message.
// This is similar to how we show messages arriving
// in verified chat using an un-verified key or cleartext.
// XXX insert code in a different PR :)
// execute group commands // execute group commands
if X_MrAddToGrp.is_some() || X_MrRemoveFromGrp.is_some() { if X_MrAddToGrp.is_some() || X_MrRemoveFromGrp.is_some() {
recreate_member_list = true; recreate_member_list = true;
@@ -1094,29 +1107,6 @@ fn create_or_lookup_group(
if send_EVENT_CHAT_MODIFIED { if send_EVENT_CHAT_MODIFIED {
context.call_cb(Event::ChatModified(chat_id)); context.call_cb(Event::ChatModified(chat_id));
} }
// check the number of receivers -
// the only critical situation is if the user hits "Reply" instead
// of "Reply all" in a non-messenger-client */
if to_ids_cnt == 1
&& !mime_parser.has_chat_version()
&& chat::get_chat_contact_cnt(context, chat_id) > 3
{
// to_ids_cnt==1 may be "From: A, To: B, SELF" as SELF is not counted in to_ids_cnt.
// So everything up to 3 is no error.
create_or_lookup_adhoc_group(
context,
mime_parser,
allow_creation,
create_blocked,
from_id,
to_ids,
)
.map_err(|err| {
warn!(context, "could not create ad-hoc group: {:?}", err);
err
})?;
}
Ok((chat_id, chat_id_blocked)) Ok((chat_id, chat_id_blocked))
} }