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

cargo fmt

Browse Source
This commit is contained in:
B. Petersen
2019-10-05 17:17:23 +02:00
committed by holger krekel
parent e40cfeec58
commit 275f5d713f
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dc_receive_imf.rs
View File

@@ -291,6 +291,7 @@ pub unsafe fn dc_receive_imf(
&rr_event_to_send, &rr_event_to_send,
); );
} }
unsafe fn add_parts( unsafe fn add_parts(
context: &Context, context: &Context,
mut mime_parser: &mut MimeParser, mut mime_parser: &mut MimeParser,
@@ -1443,7 +1444,7 @@ unsafe fn create_or_lookup_adhoc_group(
context.call_cb(Event::ChatModified(chat_id)); context.call_cb(Event::ChatModified(chat_id));
cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked); cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
return Ok(()) return Ok(());
} }
fn create_group_record( fn create_group_record(

44
src/mimefactory.rs
View File

@@ -671,30 +671,28 @@ impl<'a> MimeFactory<'a> {
.push(factory.from_displayname.to_string()); .push(factory.from_displayname.to_string());
factory.recipients_addr.push(factory.from_addr.to_string()); factory.recipients_addr.push(factory.from_addr.to_string());
} else { } else {
context context.sql.query_map(
.sql "SELECT c.authname, c.addr \
.query_map( FROM chats_contacts cc \
"SELECT c.authname, c.addr \ LEFT JOIN contacts c ON cc.contact_id=c.id \
FROM chats_contacts cc \ WHERE cc.chat_id=? AND cc.contact_id>9;",
LEFT JOIN contacts c ON cc.contact_id=c.id \ params![factory.msg.chat_id as i32],
WHERE cc.chat_id=? AND cc.contact_id>9;", |row| {
params![factory.msg.chat_id as i32], let authname: String = row.get(0)?;
|row| { let addr: String = row.get(1)?;
let authname: String = row.get(0)?; Ok((authname, addr))
let addr: String = row.get(1)?; },
Ok((authname, addr)) |rows| {
}, for row in rows {
|rows| { let (authname, addr) = row?;
for row in rows { if !vec_contains_lowercase(&factory.recipients_addr, &addr) {
let (authname, addr) = row?; factory.recipients_addr.push(addr);
if !vec_contains_lowercase(&factory.recipients_addr, &addr) { factory.recipients_names.push(authname);
factory.recipients_addr.push(addr);
factory.recipients_names.push(authname);
}
} }
Ok(()) }
}, Ok(())
)?; },
)?;
let command = factory.msg.param.get_cmd(); let command = factory.msg.param.get_cmd();
let msg = &factory.msg; let msg = &factory.msg;