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

fix logic error: adding a member to a group is okay if a real contact exists or for SELF

Browse Source
This commit is contained in:
B. Petersen
2019-10-23 14:03:08 +02:00
parent 5d79690260
commit df4273e986
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat.rs
View File

@@ -1366,8 +1366,8 @@ pub(crate) fn add_contact_to_chat_ex(
chat_id chat_id
); );
ensure!( ensure!(
Contact::real_exists_by_id(context, contact_id) && contact_id != DC_CONTACT_ID_SELF, Contact::real_exists_by_id(context, contact_id) || contact_id == DC_CONTACT_ID_SELF,
"invalid contact_id {} for removal in group", "invalid contact_id {} for adding to group",
contact_id contact_id
); );
@@ -1387,10 +1387,10 @@ pub(crate) fn add_contact_to_chat_ex(
.get_config(Config::ConfiguredAddr) .get_config(Config::ConfiguredAddr)
.unwrap_or_default(); .unwrap_or_default();
if contact.get_addr() == &self_addr { if contact.get_addr() == &self_addr {
// ourself is added using DC_CONTACT_ID_SELF, do not add this address explicitly.
// if SELF is not in the group, members cannot be added at all.
bail!("invalid attempt to add self e-mail address to group"); bail!("invalid attempt to add self e-mail address to group");
} }
// ourself is added using DC_CONTACT_ID_SELF, do not add it explicitly.
// if SELF is not in the group, members cannot be added at all.
if is_contact_in_chat(context, chat_id, contact_id) { if is_contact_in_chat(context, chat_id, contact_id) {
if !from_handshake { if !from_handshake {