getUnreadByConversationAndMarkRead: Only query incoming messages

This commit is contained in:
Scott Nonnenberg 2022-06-02 18:09:13 -07:00 committed by GitHub
parent ecdc583f2a
commit d753fe8fcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 2 deletions

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({