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

apply hocuri's niceifcation

Browse Source
This commit is contained in:
holger krekel
2022-04-01 13:45:53 +02:00
parent 93d3522f67
commit 26470c6047
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/chat.rs
View File

@@ -2258,17 +2258,20 @@ pub async fn get_chat_msgs(
let process_rows = |rows: rusqlite::MappedRows<_>| { let process_rows = |rows: rusqlite::MappedRows<_>| {
// It is faster to sort here rather than // It is faster to sort here rather than
// let sqlite execute an ORDER BY clause. // let sqlite execute an ORDER BY clause.
let mut sorted_rows = Vec::<(i64, MsgId, bool)>::new(); let mut sorted_rows = Vec::new();
for row in rows { for row in rows {
let (ts, curr_id, exclude_message) = row?; let (ts, curr_id, exclude_message): (i64, MsgId, bool) = row?;
sorted_rows.push((ts, curr_id, exclude_message)); if !exclude_message {
sorted_rows.push((ts, curr_id));
}
} }
sorted_rows.sort_unstable(); sorted_rows.sort_unstable();
let mut ret = Vec::new(); let mut ret = Vec::new();
let mut last_day = 0; let mut last_day = 0;
let cnv_to_local = dc_gm2local_offset(); let cnv_to_local = dc_gm2local_offset();
for (ts, curr_id, exclude_message) in sorted_rows { let markerbefore.unwrap_or_else(MsgId::not_set()
for (ts, curr_id) in sorted_rows {
if let Some(marker_id) = marker1before { if let Some(marker_id) = marker1before {
if curr_id == marker_id { if curr_id == marker_id {
ret.push(ChatItem::Marker1); ret.push(ChatItem::Marker1);
@@ -2284,9 +2287,7 @@ pub async fn get_chat_msgs(
last_day = curr_day; last_day = curr_day;
} }
} }
if !exclude_message { ret.push(ChatItem::Message { msg_id: curr_id });
ret.push(ChatItem::Message { msg_id: curr_id });
}
} }
Ok(ret) Ok(ret)
}; };