jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix getUnreadReactionsAndMarkRead

This commit is contained in:
Fedor Indutny 2021-12-21 21:01:09 +01:00 committed by GitHub
parent 327a38a552
commit f5312b9463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/sql/Server.ts
View File

@ -2152,7 +2152,7 @@ async function getUnreadReactionsAndMarkRead({
const unreadMessages: Array<ReactionResultType> = db
.prepare<Query>(
`
SELECT rowid, targetAuthorUuid, targetTimestamp, messageId
SELECT reactions.rowid, targetAuthorUuid, targetTimestamp, messageId
FROM reactions
JOIN messages on messages.id IS reactions.messageId
WHERE

24
ts/test-electron/sql/markRead_test.ts
View File

@ -417,6 +417,17 @@ describe('sql/markRead', () => {
const storyId = getUuid();
const ourUuid = getUuid();
const pad: Array<MessageAttributesType> = Array.from({ length: 4 }, _ => {
return {
id: getUuid(),
body: 'pad message',
type: 'incoming',
conversationId,
sent_at: start - 1,
received_at: start - 1,
timestamp: start - 1,
};
});
const message1: MessageAttributesType = {
id: getUuid(),
body: 'message 1',
@ -464,11 +475,14 @@ describe('sql/markRead', () => {
timestamp: start + 5,
};
await saveMessages([message1, message2, message3, message4, message5], {
forceSave: true,
ourUuid,
});
assert.lengthOf(await _getAllMessages(), 5);
await saveMessages(
[...pad, message1, message2, message3, message4, message5],
{
forceSave: true,
ourUuid,
}
);
assert.lengthOf(await _getAllMessages(), pad.length + 5);
const reaction1: ReactionType = {
conversationId,