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

feat: add more context to remove_contact_from_chat errors

Browse Source
This commit is contained in:
link2xt
2024-10-19 22:30:02 +00:00
parent 95c252a5a6
commit deb14600e8
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/chat.rs
View File

@@ -3949,12 +3949,19 @@ pub async fn remove_contact_from_chat(
} }
msg.param.set_cmd(SystemMessage::MemberRemovedFromGroup); msg.param.set_cmd(SystemMessage::MemberRemovedFromGroup);
msg.param.set(Param::Arg, contact.get_addr().to_lowercase()); msg.param.set(Param::Arg, contact.get_addr().to_lowercase());
let res = send_msg(context, chat_id, &mut msg).await; let res = send_msg(context, chat_id, &mut msg)
.await
.context("Failed to send member removed message");
if contact_id == ContactId::SELF { if contact_id == ContactId::SELF {
res?; res?;
set_group_explicitly_left(context, &chat.grpid).await?; set_group_explicitly_left(context, &chat.grpid)
.await
.context("Failed to mark group as explicitly left")?;
} else if let Err(e) = res { } else if let Err(e) = res {
warn!(context, "remove_contact_from_chat({chat_id}, {contact_id}): send_msg() failed: {e:#}."); warn!(
context,
"remove_contact_from_chat({chat_id}, {contact_id}): {e:#}."
);
} }
} else { } else {
sync = Sync; sync = Sync;
@@ -3971,7 +3978,9 @@ pub async fn remove_contact_from_chat(
// in order to correctly determine encryption so if we // in order to correctly determine encryption so if we
// removed it first, it would complicate the // removed it first, it would complicate the
// check/encryption logic. // check/encryption logic.
remove_from_chat_contacts_table(context, chat_id, contact_id).await?; remove_from_chat_contacts_table(context, chat_id, contact_id)
.await
.context("Failed to remove contact from chats_contacts table")?;
context.emit_event(EventType::ChatModified(chat_id)); context.emit_event(EventType::ChatModified(chat_id));
if sync.into() { if sync.into() {
chat.sync_contacts(context).await.log_err(context).ok(); chat.sync_contacts(context).await.log_err(context).ok();