mirror of
https://github.com/chatmail/core.git
synced 2026-05-07 00:46:31 +03:00
fix a few more places that used format! with sql-queries -- although they are all probably not critical
This commit is contained in:
@@ -1915,11 +1915,8 @@ pub fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: u32) -> Resul
|
|||||||
ensure!(chat.can_send(), "cannot send to chat #{}", chat_id);
|
ensure!(chat.can_send(), "cannot send to chat #{}", chat_id);
|
||||||
curr_timestamp = dc_create_smeared_timestamps(context, msg_ids.len());
|
curr_timestamp = dc_create_smeared_timestamps(context, msg_ids.len());
|
||||||
let ids = context.sql.query_map(
|
let ids = context.sql.query_map(
|
||||||
format!(
|
|
||||||
"SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id",
|
"SELECT id FROM msgs WHERE id IN({}) ORDER BY timestamp,id",
|
||||||
msg_ids.iter().map(|_| "?").join(",")
|
params![msg_ids.iter().map(|_| "?").join(",")],
|
||||||
),
|
|
||||||
msg_ids,
|
|
||||||
|row| row.get::<_, MsgId>(0),
|
|row| row.get::<_, MsgId>(0),
|
||||||
|ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
|
|ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
|
||||||
)?;
|
)?;
|
||||||
|
|||||||
@@ -1148,12 +1148,9 @@ fn create_or_lookup_adhoc_group(
|
|||||||
if !chat_ids.is_empty() {
|
if !chat_ids.is_empty() {
|
||||||
let chat_ids_str = join(chat_ids.iter().map(|x| x.to_string()), ",");
|
let chat_ids_str = join(chat_ids.iter().map(|x| x.to_string()), ",");
|
||||||
let res = context.sql.query_row(
|
let res = context.sql.query_row(
|
||||||
format!(
|
|
||||||
"SELECT c.id, c.blocked FROM chats c \
|
"SELECT c.id, c.blocked FROM chats c \
|
||||||
LEFT JOIN msgs m ON m.chat_id=c.id WHERE c.id IN({}) ORDER BY m.timestamp DESC, m.id DESC LIMIT 1;",
|
LEFT JOIN msgs m ON m.chat_id=c.id WHERE c.id IN({}) ORDER BY m.timestamp DESC, m.id DESC LIMIT 1;",
|
||||||
chat_ids_str
|
params!(chat_ids_str),
|
||||||
),
|
|
||||||
params![],
|
|
||||||
|row| {
|
|row| {
|
||||||
Ok((row.get::<_, i32>(0)?, row.get::<_, Option<Blocked>>(1)?.unwrap_or_default()))
|
Ok((row.get::<_, i32>(0)?, row.get::<_, Option<Blocked>>(1)?.unwrap_or_default()))
|
||||||
}
|
}
|
||||||
@@ -1252,11 +1249,8 @@ fn create_adhoc_grp_id(context: &Context, member_ids: &[u32]) -> String {
|
|||||||
let members = context
|
let members = context
|
||||||
.sql
|
.sql
|
||||||
.query_map(
|
.query_map(
|
||||||
format!(
|
|
||||||
"SELECT addr FROM contacts WHERE id IN({}) AND id!=1", // 1=DC_CONTACT_ID_SELF
|
"SELECT addr FROM contacts WHERE id IN({}) AND id!=1", // 1=DC_CONTACT_ID_SELF
|
||||||
member_ids_str
|
params![member_ids_str],
|
||||||
),
|
|
||||||
params![],
|
|
||||||
|row| row.get::<_, String>(0),
|
|row| row.get::<_, String>(0),
|
||||||
|rows| {
|
|rows| {
|
||||||
let mut addrs = rows.collect::<std::result::Result<Vec<_>, _>>()?;
|
let mut addrs = rows.collect::<std::result::Result<Vec<_>, _>>()?;
|
||||||
@@ -1300,7 +1294,6 @@ fn search_chat_ids_by_contact_ids(
|
|||||||
contact_ids.sort();
|
contact_ids.sort();
|
||||||
let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
|
let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
|
||||||
context.sql.query_map(
|
context.sql.query_map(
|
||||||
format!(
|
|
||||||
"SELECT DISTINCT cc.chat_id, cc.contact_id \
|
"SELECT DISTINCT cc.chat_id, cc.contact_id \
|
||||||
FROM chats_contacts cc \
|
FROM chats_contacts cc \
|
||||||
LEFT JOIN chats c ON c.id=cc.chat_id \
|
LEFT JOIN chats c ON c.id=cc.chat_id \
|
||||||
@@ -1308,9 +1301,7 @@ fn search_chat_ids_by_contact_ids(
|
|||||||
AND c.type=120 \
|
AND c.type=120 \
|
||||||
AND cc.contact_id!=1 \
|
AND cc.contact_id!=1 \
|
||||||
ORDER BY cc.chat_id, cc.contact_id;", // 1=DC_CONTACT_ID_SELF
|
ORDER BY cc.chat_id, cc.contact_id;", // 1=DC_CONTACT_ID_SELF
|
||||||
contact_ids_str
|
params![contact_ids_str],
|
||||||
),
|
|
||||||
params![],
|
|
||||||
|row| Ok((row.get::<_, u32>(0)?, row.get::<_, u32>(1)?)),
|
|row| Ok((row.get::<_, u32>(0)?, row.get::<_, u32>(1)?)),
|
||||||
|rows| {
|
|rows| {
|
||||||
let mut last_chat_id = 0;
|
let mut last_chat_id = 0;
|
||||||
@@ -1338,7 +1329,7 @@ fn search_chat_ids_by_contact_ids(
|
|||||||
chat_ids.push(last_chat_id);
|
chat_ids.push(last_chat_id);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
},
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1391,12 +1382,9 @@ fn check_verified_properties(
|
|||||||
let to_ids_str = join(to_ids.iter().map(|x| x.to_string()), ",");
|
let to_ids_str = join(to_ids.iter().map(|x| x.to_string()), ",");
|
||||||
|
|
||||||
let rows = context.sql.query_map(
|
let rows = context.sql.query_map(
|
||||||
format!(
|
|
||||||
"SELECT c.addr, LENGTH(ps.verified_key_fingerprint) FROM contacts c \
|
"SELECT c.addr, LENGTH(ps.verified_key_fingerprint) FROM contacts c \
|
||||||
LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ",
|
LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ",
|
||||||
to_ids_str
|
params![to_ids_str],
|
||||||
),
|
|
||||||
params![],
|
|
||||||
|row| Ok((row.get::<_, String>(0)?, row.get::<_, i32>(1).unwrap_or(0))),
|
|row| Ok((row.get::<_, String>(0)?, row.get::<_, i32>(1).unwrap_or(0))),
|
||||||
|rows| {
|
|rows| {
|
||||||
rows.collect::<std::result::Result<Vec<_>, _>>()
|
rows.collect::<std::result::Result<Vec<_>, _>>()
|
||||||
|
|||||||
Reference in New Issue
Block a user