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

create separate function for preparing a blob

Browse Source
This commit is contained in:
B. Petersen
2019-11-04 17:00:23 +01:00
committed by holger krekel
parent cbaa4e03b3
commit 89f394ab86
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat.rs
View File

@@ -689,8 +689,7 @@ pub fn msgtype_has_file(msgtype: Viewtype) -> bool {
} }
} }
fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Result<MsgId, Error> { fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<(), Error> {
msg.id = MsgId::new_unset();
if msg.type_0 == Viewtype::Text { if msg.type_0 == Viewtype::Text {
// the caller should check if the message text is empty // the caller should check if the message text is empty
} else if msgtype_has_file(msg.type_0) { } else if msgtype_has_file(msg.type_0) {
@@ -726,7 +725,12 @@ fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Res
} else { } else {
bail!("Cannot send messages of type #{}.", msg.type_0); bail!("Cannot send messages of type #{}.", msg.type_0);
} }
Ok(())
}
fn prepare_msg_common(context: &Context, chat_id: u32, msg: &mut Message) -> Result<MsgId, Error> {
msg.id = MsgId::new_unset();
prepare_msg_blob(context, msg)?;
unarchive(context, chat_id)?; unarchive(context, chat_id)?;
let mut chat = Chat::load_from_db(context, chat_id)?; let mut chat = Chat::load_from_db(context, chat_id)?;