mirror of
https://github.com/chatmail/core.git
synced 2026-04-24 08:56:29 +03:00
show pinned chats again and order them to the top
This commit is contained in:
10
src/chat.rs
10
src/chat.rs
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user