show pinned chats again and order them to the top

This commit is contained in:
Simon Laux
2020-02-08 21:16:40 +01:00
committed by B. Petersen
parent 5678562ce2
commit 1765b8f2cf
4 changed files with 10 additions and 14 deletions

View File

@@ -148,17 +148,17 @@ impl ChatId {
self
);
let mut send_event = false;
if new_archive_state == ArchiveState::Archived {
let send_event = if new_archive_state == ArchiveState::Archived {
sql::execute(
context,
&context.sql,
"UPDATE msgs SET state=? WHERE chat_id=? AND state=?;",
params![MessageState::InNoticed, self, MessageState::InFresh],
)?;
send_event = true;
}
true
} else {
false
};
sql::execute(
context,

View File

@@ -202,9 +202,9 @@ impl Chatlist {
AND (hidden=0 OR state=?))
WHERE c.id>9
AND c.blocked=0
AND c.archived=0
AND NOT c.archived=1
GROUP BY c.id
ORDER BY IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
ORDER BY c.archived=2 DESC, IFNULL(m.timestamp,c.created_timestamp) DESC, m.id DESC;",
params![MessageState::OutDraft],
process_row,
process_rows,