Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 06:46:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1635 from deltachat/fix-chatlist-hidden

Browse Source 
fix getting last message for chatlist, avoid empty summaries
This commit is contained in:
bjoern
2020-06-19 13:36:08 +02:00
committed by GitHub
parent 2a623541d7 491af1b583
commit b6c0f44608
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/chatlist.rs
View File

@@ -147,11 +147,12 @@ impl Chatlist {
FROM chats c FROM chats c
LEFT JOIN msgs m LEFT JOIN msgs m
ON c.id=m.chat_id ON c.id=m.chat_id
AND m.timestamp=( AND m.id=(
SELECT MAX(timestamp) SELECT id
FROM msgs FROM msgs
WHERE chat_id=c.id WHERE chat_id=c.id
AND (hidden=0 OR state=?1)) AND (hidden=0 OR state=?1)
ORDER BY timestamp DESC, id DESC LIMIT 1)
WHERE c.id>9 WHERE c.id>9
AND c.blocked=0 AND c.blocked=0
AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?2) AND c.id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?2)
@@ -173,11 +174,12 @@ impl Chatlist {
FROM chats c FROM chats c
LEFT JOIN msgs m LEFT JOIN msgs m
ON c.id=m.chat_id ON c.id=m.chat_id
AND m.timestamp=( AND m.id=(
SELECT MAX(timestamp) SELECT id
FROM msgs FROM msgs
WHERE chat_id=c.id WHERE chat_id=c.id
AND (hidden=0 OR state=?)) AND (hidden=0 OR state=?)
ORDER BY timestamp DESC, id DESC LIMIT 1)
WHERE c.id>9 WHERE c.id>9
AND c.blocked=0 AND c.blocked=0
AND c.archived=1 AND c.archived=1
@@ -206,11 +208,12 @@ impl Chatlist {
FROM chats c FROM chats c
LEFT JOIN msgs m LEFT JOIN msgs m
ON c.id=m.chat_id ON c.id=m.chat_id
AND m.timestamp=( AND m.id=(
SELECT MAX(timestamp) SELECT id
FROM msgs FROM msgs
WHERE chat_id=c.id WHERE chat_id=c.id
AND (hidden=0 OR state=?1)) AND (hidden=0 OR state=?1)
ORDER BY timestamp DESC, id DESC LIMIT 1)
WHERE c.id>9 AND c.id!=?2 WHERE c.id>9 AND c.id!=?2
AND c.blocked=0 AND c.blocked=0
AND c.name LIKE ?3 AND c.name LIKE ?3
@@ -236,11 +239,12 @@ impl Chatlist {
FROM chats c FROM chats c
LEFT JOIN msgs m LEFT JOIN msgs m
ON c.id=m.chat_id ON c.id=m.chat_id
AND m.timestamp=( AND m.id=(
SELECT MAX(timestamp) SELECT id
FROM msgs FROM msgs
WHERE chat_id=c.id WHERE chat_id=c.id
AND (hidden=0 OR state=?1)) AND (hidden=0 OR state=?1)
ORDER BY timestamp DESC, id DESC LIMIT 1)
WHERE c.id>9 AND c.id!=?2 WHERE c.id>9 AND c.id!=?2
AND c.blocked=0 AND c.blocked=0
AND NOT c.archived=?3 AND NOT c.archived=?3