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

Fix one clippy::unneeded_unwrap warning

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-08-27 23:06:56 +00:00
parent 0a9f61783d
commit 85e16f6e82
1 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/chat.rs
View File

@@ -1563,58 +1563,57 @@ pub unsafe fn remove_contact_from_chat(
/* we do not check if "contact_id" exists but just delete all records with the id from chats_contacts */ /* 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. */ /* this allows to delete pending references to deleted contacts. Of course, this should _not_ happen. */
let chat = Chat::load_from_db(context, chat_id); if let Ok(chat) = Chat::load_from_db(context, chat_id) {
if real_group_exists(context, chat_id) {
if !(!real_group_exists(context, chat_id) || chat.is_err()) { if !(is_contact_in_chat(context, chat_id, 1 as u32) == 1) {
let chat = chat.unwrap(); log_event!(
if !(is_contact_in_chat(context, chat_id, 1 as u32) == 1) { context,
log_event!( Event::ERROR_SELF_NOT_IN_GROUP,
context, 0,
Event::ERROR_SELF_NOT_IN_GROUP, "Cannot remove contact from chat; self not in group.",
0, );
"Cannot remove contact from chat; self not in group.", } else {
); /* we should respect this - whatever we send to the group, it gets discarded anyway! */
} else { if let Ok(contact) = Contact::get_by_id(context, contact_id) {
/* we should respect this - whatever we send to the group, it gets discarded anyway! */ if chat.param.get_int(Param::Unpromoted).unwrap_or_default() == 0 {
if let Ok(contact) = Contact::get_by_id(context, contact_id) { msg.type_0 = Viewtype::Text;
if chat.param.get_int(Param::Unpromoted).unwrap_or_default() == 0 { if contact.id == DC_CONTACT_ID_SELF as u32 {
msg.type_0 = Viewtype::Text; set_group_explicitly_left(context, chat.grpid).unwrap();
if contact.id == DC_CONTACT_ID_SELF as u32 { msg.text = Some(context.stock_system_msg(
set_group_explicitly_left(context, chat.grpid).unwrap(); StockMessage::MsgGroupLeft,
msg.text = Some(context.stock_system_msg( "",
StockMessage::MsgGroupLeft, "",
"", DC_CONTACT_ID_SELF as u32,
"", ));
DC_CONTACT_ID_SELF as u32, } else {
)); msg.text = Some(context.stock_system_msg(
} else { StockMessage::MsgDelMember,
msg.text = Some(context.stock_system_msg( contact.get_addr(),
StockMessage::MsgDelMember, "",
contact.get_addr(), DC_CONTACT_ID_SELF as u32,
"", ));
DC_CONTACT_ID_SELF as u32, }
)); msg.param.set_int(Param::Cmd, 5);
msg.param.set(Param::Arg, contact.get_addr());
msg.id = send_msg(context, chat_id, &mut msg).unwrap_or_default();
context.call_cb(
Event::MSGS_CHANGED,
chat_id as uintptr_t,
msg.id as uintptr_t,
);
} }
msg.param.set_int(Param::Cmd, 5);
msg.param.set(Param::Arg, contact.get_addr());
msg.id = send_msg(context, chat_id, &mut msg).unwrap_or_default();
context.call_cb(
Event::MSGS_CHANGED,
chat_id as uintptr_t,
msg.id as uintptr_t,
);
} }
} if sql::execute(
if sql::execute( context,
context, &context.sql,
&context.sql, "DELETE FROM chats_contacts WHERE chat_id=? AND contact_id=?;",
"DELETE FROM chats_contacts WHERE chat_id=? AND contact_id=?;", params![chat_id as i32, contact_id as i32],
params![chat_id as i32, contact_id as i32], )
) .is_ok()
.is_ok() {
{ context.call_cb(Event::CHAT_MODIFIED, chat_id as uintptr_t, 0 as uintptr_t);
context.call_cb(Event::CHAT_MODIFIED, chat_id as uintptr_t, 0 as uintptr_t); success = true;
success = true; }
} }
} }
} }