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

Simplify prepare_msg_raw() using early return

Browse Source 
This commit will fail CI due incorrect formatting. It is done
deliberately to simplify review process.
This commit is contained in:
Dmitry Bogatov
2019-09-07 03:03:35 +00:00
parent 42bce7c0bf
commit 400740fdba
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/chat.rs
View File

@@ -258,7 +258,10 @@ impl<'a> Chat<'a> {
|| self.typ == Chattype::VerifiedGroup) || self.typ == Chattype::VerifiedGroup)
{ {
error!(context, 0, "Cannot send to chat type #{}.", self.typ,); error!(context, 0, "Cannot send to chat type #{}.", self.typ,);
} else if (self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup) return Ok(0);
}
if (self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup)
&& 0 == is_contact_in_chat(context, self.id, 1 as u32) && 0 == is_contact_in_chat(context, self.id, 1 as u32)
{ {
log_event!( log_event!(
@@ -267,7 +270,9 @@ impl<'a> Chat<'a> {
0, 0,
"Cannot send message; self not in group.", "Cannot send message; self not in group.",
); );
} else { return Ok(0);
}
{
if let Some(from) = context.sql.get_config(context, "configured_addr") { if let Some(from) = context.sql.get_config(context, "configured_addr") {
let new_rfc724_mid = { let new_rfc724_mid = {
let grpid = match self.typ { let grpid = match self.typ {