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

Do not select drafts as parent message

Browse Source 
Also create a common parent_query() function to make sure we use the
same message as a parent when determining if it is encrypted and when
actually replying to it.
This commit is contained in:
Alexander Krotov
2020-01-11 22:40:25 +03:00
committed by holger krekel
parent 047d09bcb1
commit efb9a11d22
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/chat.rs
View File

@@ -182,35 +182,34 @@ impl Chat {
"Err".to_string() "Err".to_string()
} }
fn parent_query(fields: &str) -> String {
// Check for server_uid guarantees that we don't
// select a draft or undelivered message.
format!(
"SELECT {} \
FROM msgs WHERE chat_id=?1 AND server_uid!=0 \
ORDER BY timestamp DESC, id DESC \
LIMIT 1;",
fields
)
}
pub fn get_parent_mime_headers(&self, context: &Context) -> Option<(String, String, String)> { pub fn get_parent_mime_headers(&self, context: &Context) -> Option<(String, String, String)> {
let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)); let collect = |row: &rusqlite::Row| Ok((row.get(0)?, row.get(1)?, row.get(2)?));
let params = params![self.id as i32, DC_CONTACT_ID_SELF as i32]; let params = params![self.id as i32];
let sql = &context.sql; let sql = &context.sql;
// use the last messsage of another user in the group as the parent let query = Self::parent_query("rfc724_mid, mime_in_reply_to, mime_references");
let main_query = "SELECT rfc724_mid, mime_in_reply_to, mime_references \
FROM msgs WHERE chat_id=?1 AND timestamp=(SELECT max(timestamp) \
FROM msgs WHERE chat_id=?1 AND from_id!=?2);";
// there are no messages of other users - use the first message if SELF as parent sql.query_row(&query, params, collect).ok()
let fallback_query = "SELECT rfc724_mid, mime_in_reply_to, mime_references \
FROM msgs WHERE chat_id=?1 AND timestamp=(SELECT min(timestamp) \
FROM msgs WHERE chat_id=?1 AND from_id==?2);";
sql.query_row(main_query, params, collect)
.or_else(|_| sql.query_row(fallback_query, params, collect))
.ok()
} }
fn parent_is_encrypted(&self, context: &Context) -> bool { fn parent_is_encrypted(&self, context: &Context) -> bool {
let sql = &context.sql; let sql = &context.sql;
let packed: Option<String> = sql.query_get_value( let params = params![self.id as i32];
context, let query = Self::parent_query("param");
"SELECT param \
FROM msgs WHERE timestamp=(SELECT MAX(timestamp) FROM msgs WHERE chat_id=?) \ let packed: Option<String> = sql.query_get_value(context, &query, params);
ORDER BY id DESC;",
params![self.id as i32],
);
if let Some(ref packed) = packed { if let Some(ref packed) = packed {
match packed.parse::<Params>() { match packed.parse::<Params>() {