Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-25 10:58:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

getUnreadByConversationAndMarkRead: Only query incoming messages

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-06-02 18:09:13 -07:00
committed by GitHub
parent ecdc583f2a
commit d753fe8fcb
3 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ts/sql/Server.ts
View File

@@ -2101,13 +2101,15 @@ async function getUnreadByConversationAndMarkRead({
expirationStartTimestamp = $expirationStartTimestamp,
json = json_patch(json, $jsonPatch)
WHERE
conversationId = $conversationId AND
(${_storyIdPredicate(storyId, isGroup)}) AND
isStory IS 0 AND
type IS 'incoming' AND
(
expirationStartTimestamp IS NULL OR
expirationStartTimestamp > $expirationStartTimestamp
) AND
expireTimer > 0 AND
conversationId = $conversationId AND
(${_storyIdPredicate(storyId, isGroup)}) AND
received_at <= $newestUnreadAt;
`
).run({