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

Avoid ok-to-continue pattern in "do_set_draft" function

Browse Source 
Note: I strongly suggest reviewing this commit in side-by-side mode.

Note: This commit fails CI due incorrect formatting. It is done
deliberately to simplify review process.
This commit is contained in:
Dmitry Bogatov
2019-09-21 06:16:15 +00:00
parent 26f176eb7e
commit 0523868a88
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/chat.rs
View File

@@ -871,27 +871,27 @@ fn maybe_delete_draft(context: &Context, chat_id: u32) -> bool {
/// ///
/// Return true on success, false on database error. /// Return true on success, false on database error.
fn do_set_draft(context: &Context, chat_id: u32, msg: &mut Message) -> bool { fn do_set_draft(context: &Context, chat_id: u32, msg: &mut Message) -> bool {
let mut OK_TO_CONTINUE = true;
let mut sth_changed = false; let mut sth_changed = false;
// save new draft match msg.type_0 {
if msg.type_0 == Viewtype::Text { Viewtype::Unknown => return false,
OK_TO_CONTINUE = msg.text.as_ref().map_or(false, |s| !s.is_empty()); Viewtype::Text => if msg.text.as_ref().map_or(false, |s| s.is_empty()) {
} else if msgtype_has_file(msg.type_0) { return false;
},
_ =>
if let Some(path_filename) = msg.param.get(Param::File) { if let Some(path_filename) = msg.param.get(Param::File) {
let mut path_filename = path_filename.to_string(); let mut path_filename = path_filename.to_string();
if dc_msg_is_increation(msg) && !dc_is_blobdir_path(context, &path_filename) { if dc_msg_is_increation(msg) && !dc_is_blobdir_path(context, &path_filename) {
OK_TO_CONTINUE = false; return false;
} else if !dc_make_rel_and_copy(context, &mut path_filename) { }
OK_TO_CONTINUE = false; if !dc_make_rel_and_copy(context, &mut path_filename) {
} else { return false;
}
msg.param.set(Param::File, path_filename); msg.param.set(Param::File, path_filename);
} }
} }
} else {
OK_TO_CONTINUE = false; {
}
if OK_TO_CONTINUE {
if sql::execute( if sql::execute(
context, context,
&context.sql, &context.sql,