Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(remove_contact_from_chat): do not ignore database errors when loading the contact

Browse Source
This commit is contained in:
link2xt
2023-07-02 17:12:20 +00:00
parent 2a6b7d9766
commit ce6876c418
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.rs
View File

@@ -3182,8 +3182,6 @@ pub async fn remove_contact_from_chat(
let mut msg = Message::default(); let mut msg = Message::default();
let mut success = false; let mut success = false;
/* we do not check if "contact_id" exists but just delete all records with the id from chats_contacts */
/* this allows to delete pending references to deleted contacts. Of course, this should _not_ happen. */
if let Ok(chat) = Chat::load_from_db(context, chat_id).await { if let Ok(chat) = Chat::load_from_db(context, chat_id).await {
if chat.typ == Chattype::Group || chat.typ == Chattype::Broadcast { if chat.typ == Chattype::Group || chat.typ == Chattype::Broadcast {
if !chat.is_self_in_chat(context).await? { if !chat.is_self_in_chat(context).await? {
@@ -3191,7 +3189,10 @@ pub async fn remove_contact_from_chat(
"Cannot remove contact from chat; self not in group.".into(), "Cannot remove contact from chat; self not in group.".into(),
)); ));
} else { } else {
if let Ok(contact) = Contact::get_by_id(context, contact_id).await { // We do not return an error if the contact does not exist in the database.
// This allows to delete dangling references to deleted contacts
// in case of the database becoming inconsistent due to a bug.
if let Some(contact) = Contact::get_by_id_optional(context, contact_id).await? {
if chat.typ == Chattype::Group && chat.is_promoted() { if chat.typ == Chattype::Group && chat.is_promoted() {
msg.viewtype = Viewtype::Text; msg.viewtype = Viewtype::Text;
if contact.id == ContactId::SELF { if contact.id == ContactId::SELF {