diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 7cbfdc9fc..043dd2dbc 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -291,6 +291,7 @@ pub unsafe fn dc_receive_imf( &rr_event_to_send, ); } + unsafe fn add_parts( context: &Context, mut mime_parser: &mut MimeParser, @@ -1443,7 +1444,7 @@ unsafe fn create_or_lookup_adhoc_group( context.call_cb(Event::ChatModified(chat_id)); cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked); - return Ok(()) + return Ok(()); } fn create_group_record( diff --git a/src/mimefactory.rs b/src/mimefactory.rs index e8f18e4fc..0523307aa 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -671,30 +671,28 @@ impl<'a> MimeFactory<'a> { .push(factory.from_displayname.to_string()); factory.recipients_addr.push(factory.from_addr.to_string()); } else { - context - .sql - .query_map( - "SELECT c.authname, c.addr \ - FROM chats_contacts cc \ - LEFT JOIN contacts c ON cc.contact_id=c.id \ - WHERE cc.chat_id=? AND cc.contact_id>9;", - params![factory.msg.chat_id as i32], - |row| { - let authname: String = row.get(0)?; - let addr: String = row.get(1)?; - Ok((authname, addr)) - }, - |rows| { - for row in rows { - let (authname, addr) = row?; - if !vec_contains_lowercase(&factory.recipients_addr, &addr) { - factory.recipients_addr.push(addr); - factory.recipients_names.push(authname); - } + context.sql.query_map( + "SELECT c.authname, c.addr \ + FROM chats_contacts cc \ + LEFT JOIN contacts c ON cc.contact_id=c.id \ + WHERE cc.chat_id=? AND cc.contact_id>9;", + params![factory.msg.chat_id as i32], + |row| { + let authname: String = row.get(0)?; + let addr: String = row.get(1)?; + Ok((authname, addr)) + }, + |rows| { + for row in rows { + let (authname, addr) = row?; + if !vec_contains_lowercase(&factory.recipients_addr, &addr) { + factory.recipients_addr.push(addr); + factory.recipients_names.push(authname); } - Ok(()) - }, - )?; + } + Ok(()) + }, + )?; let command = factory.msg.param.get_cmd(); let msg = &factory.msg;