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

refactor(remove_contact_from_chat): remove one level of indentation

Browse Source
This commit is contained in:
link2xt
2024-10-19 22:25:29 +00:00
parent 1b824705fd
commit 95c252a5a6
1 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/chat.rs
View File

@@ -3920,11 +3920,13 @@ pub async fn remove_contact_from_chat(
let mut msg = Message::default(); let mut msg = Message::default();
let chat = Chat::load_from_db(context, chat_id).await?; let 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 {
bail!("Cannot remove members from non-group chats.");
}
if !chat.is_self_in_chat(context).await? { if !chat.is_self_in_chat(context).await? {
let err_msg = format!( let err_msg =
"Cannot remove contact {contact_id} from chat {chat_id}: self not in group." format!("Cannot remove contact {contact_id} from chat {chat_id}: self not in group.");
);
context.emit_event(EventType::ErrorSelfNotInGroup(err_msg.clone())); context.emit_event(EventType::ErrorSelfNotInGroup(err_msg.clone()));
bail!("{}", err_msg); bail!("{}", err_msg);
} else { } else {
@@ -3975,9 +3977,6 @@ pub async fn remove_contact_from_chat(
chat.sync_contacts(context).await.log_err(context).ok(); chat.sync_contacts(context).await.log_err(context).ok();
} }
} }
} else {
bail!("Cannot remove members from non-group chats.");
}
Ok(()) Ok(())
} }