Optimize a few queries
This commit is contained in:
Scott Nonnenberg
GitHub
parent
b08691b35b
commit
60a53656af
27 changed files with 1288 additions and 186 deletions
|
|
@ -32,6 +32,7 @@ describe('sql/allMedia', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -62,7 +63,10 @@ describe('sql/allMedia', () => {
|
|||
hasVisualMediaAttachments: true,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -79,6 +83,7 @@ describe('sql/allMedia', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -112,7 +117,10 @@ describe('sql/allMedia', () => {
|
|||
hasVisualMediaAttachments: true,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -131,6 +139,7 @@ describe('sql/allMedia', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -161,7 +170,10 @@ describe('sql/allMedia', () => {
|
|||
hasFileAttachments: true,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -178,6 +190,7 @@ describe('sql/allMedia', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -211,7 +224,10 @@ describe('sql/allMedia', () => {
|
|||
hasFileAttachments: true,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
|
|||
548
ts/test-electron/sql/conversationSummary_test.ts
Normal file
548
ts/test-electron/sql/conversationSummary_test.ts
Normal file
|
|
@ -0,0 +1,548 @@
|
|||
// Copyright 2021 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { assert } from 'chai';
|
||||
|
||||
import dataInterface from '../../sql/Client';
|
||||
import { UUID } from '../../types/UUID';
|
||||
import type { UUIDStringType } from '../../types/UUID';
|
||||
|
||||
import type { MessageAttributesType } from '../../model-types.d';
|
||||
|
||||
const {
|
||||
removeAll,
|
||||
_getAllMessages,
|
||||
saveMessages,
|
||||
getLastConversationMessages,
|
||||
} = dataInterface;
|
||||
|
||||
function getUuid(): UUIDStringType {
|
||||
return UUID.generate().toString();
|
||||
}
|
||||
|
||||
describe('sql/conversationSummary', () => {
|
||||
beforeEach(async () => {
|
||||
await removeAll();
|
||||
});
|
||||
|
||||
describe('getLastConversationMessages', () => {
|
||||
it('returns the latest message in current conversation', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
const message3: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 3',
|
||||
type: 'outgoing',
|
||||
conversationId: getUuid(),
|
||||
sent_at: now + 3,
|
||||
received_at: now + 3,
|
||||
timestamp: now + 3,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.activity?.body, message2.body, 'activity');
|
||||
assert.strictEqual(messages.preview?.body, message2.body, 'preview');
|
||||
assert.isTrue(messages.hasUserInitiatedMessages);
|
||||
});
|
||||
|
||||
it('preview excludes several message types, allows type = NULL', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
// @ts-expect-error We're forcing a null type here for testing
|
||||
type: null,
|
||||
conversationId,
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'change-number-notification',
|
||||
conversationId,
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
const message3: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 3',
|
||||
type: 'group-v1-migration',
|
||||
conversationId,
|
||||
sent_at: now + 3,
|
||||
received_at: now + 3,
|
||||
timestamp: now + 3,
|
||||
};
|
||||
const message4: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 4',
|
||||
type: 'message-history-unsynced',
|
||||
conversationId,
|
||||
sent_at: now + 4,
|
||||
received_at: now + 4,
|
||||
timestamp: now + 4,
|
||||
};
|
||||
const message5: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 5',
|
||||
type: 'profile-change',
|
||||
conversationId,
|
||||
sent_at: now + 5,
|
||||
received_at: now + 5,
|
||||
timestamp: now + 5,
|
||||
};
|
||||
const message6: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 6',
|
||||
type: 'story',
|
||||
conversationId,
|
||||
sent_at: now + 6,
|
||||
received_at: now + 6,
|
||||
timestamp: now + 6,
|
||||
};
|
||||
const message7: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 7',
|
||||
type: 'universal-timer-notification',
|
||||
conversationId,
|
||||
sent_at: now + 7,
|
||||
received_at: now + 7,
|
||||
timestamp: now + 7,
|
||||
};
|
||||
const message8: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 8',
|
||||
type: 'verified-change',
|
||||
conversationId,
|
||||
sent_at: now + 8,
|
||||
received_at: now + 8,
|
||||
timestamp: now + 8,
|
||||
};
|
||||
|
||||
await saveMessages(
|
||||
[
|
||||
message1,
|
||||
message2,
|
||||
message3,
|
||||
message4,
|
||||
message5,
|
||||
message6,
|
||||
message7,
|
||||
message8,
|
||||
],
|
||||
{
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
}
|
||||
);
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 8);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.preview?.body, message1.body);
|
||||
});
|
||||
|
||||
it('activity excludes several message types, allows type = NULL', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
// @ts-expect-error We're forcing a null type here for testing
|
||||
type: null,
|
||||
conversationId,
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'change-number-notification',
|
||||
conversationId,
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
const message3: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 3',
|
||||
type: 'group-v1-migration',
|
||||
conversationId,
|
||||
sent_at: now + 3,
|
||||
received_at: now + 3,
|
||||
timestamp: now + 3,
|
||||
};
|
||||
const message4: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 4',
|
||||
type: 'keychange',
|
||||
conversationId,
|
||||
sent_at: now + 4,
|
||||
received_at: now + 4,
|
||||
timestamp: now + 4,
|
||||
};
|
||||
const message5: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 5',
|
||||
type: 'message-history-unsynced',
|
||||
conversationId,
|
||||
sent_at: now + 5,
|
||||
received_at: now + 5,
|
||||
timestamp: now + 5,
|
||||
};
|
||||
const message6: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 6',
|
||||
type: 'profile-change',
|
||||
conversationId,
|
||||
sent_at: now + 6,
|
||||
received_at: now + 6,
|
||||
timestamp: now + 6,
|
||||
};
|
||||
const message7: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 7',
|
||||
type: 'story',
|
||||
conversationId,
|
||||
sent_at: now + 7,
|
||||
received_at: now + 7,
|
||||
timestamp: now + 7,
|
||||
};
|
||||
const message8: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 8',
|
||||
type: 'universal-timer-notification',
|
||||
conversationId,
|
||||
sent_at: now + 8,
|
||||
received_at: now + 8,
|
||||
timestamp: now + 8,
|
||||
};
|
||||
const message9: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 9',
|
||||
type: 'verified-change',
|
||||
conversationId,
|
||||
sent_at: now + 9,
|
||||
received_at: now + 9,
|
||||
timestamp: now + 9,
|
||||
};
|
||||
|
||||
await saveMessages(
|
||||
[
|
||||
message1,
|
||||
message2,
|
||||
message3,
|
||||
message4,
|
||||
message5,
|
||||
message6,
|
||||
message7,
|
||||
message8,
|
||||
message9,
|
||||
],
|
||||
{
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
}
|
||||
);
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 9);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.activity?.body, message1.body);
|
||||
});
|
||||
|
||||
it('activity excludes expirationTimerUpdates with fromSync = true, includes fromSync = undefined', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationTimerUpdate: {
|
||||
expireTimer: 10,
|
||||
source: 'you',
|
||||
},
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationTimerUpdate: {
|
||||
expireTimer: 10,
|
||||
fromSync: true,
|
||||
},
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 2);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.activity?.body, message1.body);
|
||||
});
|
||||
|
||||
it('activity excludes expirationTimerUpdates with fromSync = true, includes fromSync = false', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationTimerUpdate: {
|
||||
expireTimer: 10,
|
||||
source: 'you',
|
||||
fromSync: false,
|
||||
},
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationTimerUpdate: {
|
||||
expireTimer: 10,
|
||||
fromSync: true,
|
||||
},
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 2);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.activity?.body, message1.body);
|
||||
});
|
||||
|
||||
it('preview excludes expired message, includes non-disappearing message', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationStartTimestamp: now - 2 * 1000,
|
||||
expireTimer: 1,
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 2);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.preview?.body, message1.body);
|
||||
});
|
||||
|
||||
it('preview excludes expired message, includes non-disappearing message', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationStartTimestamp: now,
|
||||
expireTimer: 30,
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2',
|
||||
type: 'outgoing',
|
||||
conversationId,
|
||||
expirationStartTimestamp: now - 2 * 1000,
|
||||
expireTimer: 1,
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 2);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.preview?.body, message1.body);
|
||||
});
|
||||
|
||||
it('excludes group v2 change events where someone else leaves a group', async () => {
|
||||
assert.lengthOf(await _getAllMessages(), 0);
|
||||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const otherUuid = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1 - removing ourselves',
|
||||
type: 'group-v2-change',
|
||||
conversationId,
|
||||
groupV2Change: {
|
||||
from: ourUuid,
|
||||
details: [
|
||||
{
|
||||
type: 'member-remove',
|
||||
uuid: ourUuid,
|
||||
},
|
||||
],
|
||||
},
|
||||
sent_at: now + 1,
|
||||
received_at: now + 1,
|
||||
timestamp: now + 1,
|
||||
};
|
||||
const message2: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 2 - someone else leaving',
|
||||
type: 'group-v2-change',
|
||||
conversationId,
|
||||
groupV2Change: {
|
||||
from: otherUuid,
|
||||
details: [
|
||||
{
|
||||
type: 'member-remove',
|
||||
uuid: otherUuid,
|
||||
},
|
||||
],
|
||||
},
|
||||
sent_at: now + 2,
|
||||
received_at: now + 2,
|
||||
timestamp: now + 2,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 2);
|
||||
|
||||
const messages = await getLastConversationMessages({
|
||||
conversationId,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(messages.activity?.body, message1.body, 'activity');
|
||||
assert.strictEqual(messages.preview?.body, message1.body, 'preview');
|
||||
assert.isFalse(messages.hasUserInitiatedMessages);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -31,6 +31,7 @@ describe('sql/fullTextSearch', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1 - generic string',
|
||||
|
|
@ -59,7 +60,10 @@ describe('sql/fullTextSearch', () => {
|
|||
timestamp: now,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -68,7 +72,7 @@ describe('sql/fullTextSearch', () => {
|
|||
assert.strictEqual(searchResults[0].id, message2.id);
|
||||
|
||||
message3.body = 'message 3 - unique string';
|
||||
await saveMessage(message3);
|
||||
await saveMessage(message3, { ourUuid });
|
||||
|
||||
const searchResults2 = await searchMessages('unique');
|
||||
assert.lengthOf(searchResults2, 2);
|
||||
|
|
@ -81,6 +85,7 @@ describe('sql/fullTextSearch', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1 - unique string',
|
||||
|
|
@ -111,7 +116,10 @@ describe('sql/fullTextSearch', () => {
|
|||
isViewOnce: true,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -120,7 +128,7 @@ describe('sql/fullTextSearch', () => {
|
|||
assert.strictEqual(searchResults[0].id, message1.id);
|
||||
|
||||
message1.body = 'message 3 - unique string';
|
||||
await saveMessage(message3);
|
||||
await saveMessage(message3, { ourUuid });
|
||||
|
||||
const searchResults2 = await searchMessages('unique');
|
||||
assert.lengthOf(searchResults2, 1);
|
||||
|
|
@ -132,6 +140,7 @@ describe('sql/fullTextSearch', () => {
|
|||
|
||||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1 - unique string',
|
||||
|
|
@ -162,7 +171,10 @@ describe('sql/fullTextSearch', () => {
|
|||
storyId: getUuid(),
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -171,7 +183,7 @@ describe('sql/fullTextSearch', () => {
|
|||
assert.strictEqual(searchResults[0].id, message1.id);
|
||||
|
||||
message1.body = 'message 3 - unique string';
|
||||
await saveMessage(message3);
|
||||
await saveMessage(message3, { ourUuid });
|
||||
|
||||
const searchResults2 = await searchMessages('unique');
|
||||
assert.lengthOf(searchResults2, 1);
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ describe('sql/markRead', () => {
|
|||
const start = Date.now();
|
||||
const readAt = start + 20;
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -117,6 +118,7 @@ describe('sql/markRead', () => {
|
|||
[message1, message2, message3, message4, message5, message6, message7],
|
||||
{
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -175,6 +177,7 @@ describe('sql/markRead', () => {
|
|||
const readAt = start + 20;
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -258,6 +261,7 @@ describe('sql/markRead', () => {
|
|||
[message1, message2, message3, message4, message5, message6, message7],
|
||||
{
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -297,6 +301,7 @@ describe('sql/markRead', () => {
|
|||
const readAt = start + 20;
|
||||
const conversationId = getUuid();
|
||||
const expireTimer = 15;
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -356,6 +361,7 @@ describe('sql/markRead', () => {
|
|||
|
||||
await saveMessages([message1, message2, message3, message4, message5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.strictEqual(
|
||||
|
|
@ -409,6 +415,7 @@ describe('sql/markRead', () => {
|
|||
const start = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -459,6 +466,7 @@ describe('sql/markRead', () => {
|
|||
|
||||
await saveMessages([message1, message2, message3, message4, message5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
||||
|
|
@ -553,6 +561,7 @@ describe('sql/markRead', () => {
|
|||
const start = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -606,6 +615,7 @@ describe('sql/markRead', () => {
|
|||
|
||||
await saveMessages([message1, message2, message3, message4, message5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
// Copyright 2021 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { v4 as getGuid } from 'uuid';
|
||||
|
||||
import { assert } from 'chai';
|
||||
|
||||
import dataInterface from '../../sql/Client';
|
||||
import { UUID } from '../../types/UUID';
|
||||
import type { UUIDStringType } from '../../types/UUID';
|
||||
import { constantTimeEqual, getRandomBytes } from '../../Crypto';
|
||||
|
||||
function getUuid(): UUIDStringType {
|
||||
return UUID.generate().toString();
|
||||
}
|
||||
|
||||
const {
|
||||
_getAllSentProtoMessageIds,
|
||||
_getAllSentProtoRecipients,
|
||||
|
|
@ -37,9 +41,9 @@ describe('sql/sendLog', () => {
|
|||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2],
|
||||
[getUuid()]: [1, 2],
|
||||
},
|
||||
});
|
||||
const allProtos = await getAllSentProtos();
|
||||
|
|
@ -69,10 +73,10 @@ describe('sql/sendLog', () => {
|
|||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid(), getGuid()],
|
||||
messageIds: [getUuid(), getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2],
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1, 2],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -88,21 +92,22 @@ describe('sql/sendLog', () => {
|
|||
});
|
||||
|
||||
it('trigger deletes payload when referenced message is deleted', async () => {
|
||||
const id = getGuid();
|
||||
const id = getUuid();
|
||||
const timestamp = Date.now();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
await saveMessage(
|
||||
{
|
||||
id,
|
||||
|
||||
body: 'some text',
|
||||
conversationId: getGuid(),
|
||||
conversationId: getUuid(),
|
||||
received_at: timestamp,
|
||||
sent_at: timestamp,
|
||||
timestamp,
|
||||
type: 'outgoing',
|
||||
},
|
||||
{ forceSave: true }
|
||||
{ forceSave: true, ourUuid }
|
||||
);
|
||||
|
||||
const bytes = getRandomBytes(128);
|
||||
|
|
@ -114,7 +119,7 @@ describe('sql/sendLog', () => {
|
|||
await insertSentProto(proto, {
|
||||
messageIds: [id],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2],
|
||||
[getUuid()]: [1, 2],
|
||||
},
|
||||
});
|
||||
const allProtos = await getAllSentProtos();
|
||||
|
|
@ -133,9 +138,9 @@ describe('sql/sendLog', () => {
|
|||
it('supports adding duplicates', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const messageIds = [getGuid()];
|
||||
const messageIds = [getUuid()];
|
||||
const recipients = {
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1],
|
||||
};
|
||||
const proto1 = {
|
||||
contentHint: 7,
|
||||
|
|
@ -170,7 +175,7 @@ describe('sql/sendLog', () => {
|
|||
it('handles duplicates, adding new recipients if needed', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const messageIds = [getGuid()];
|
||||
const messageIds = [getUuid()];
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
|
|
@ -184,7 +189,7 @@ describe('sql/sendLog', () => {
|
|||
const id = await insertSentProto(proto, {
|
||||
messageIds,
|
||||
recipients: {
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -192,7 +197,7 @@ describe('sql/sendLog', () => {
|
|||
assert.lengthOf(await _getAllSentProtoMessageIds(), 1);
|
||||
assert.lengthOf(await _getAllSentProtoRecipients(), 1);
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const recipientUuid = getUuid();
|
||||
await insertProtoRecipients({
|
||||
id,
|
||||
recipientUuid,
|
||||
|
|
@ -225,21 +230,21 @@ describe('sql/sendLog', () => {
|
|||
timestamp: timestamp - 15,
|
||||
};
|
||||
await insertSentProto(proto1, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
await insertSentProto(proto2, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2],
|
||||
[getUuid()]: [1, 2],
|
||||
},
|
||||
});
|
||||
await insertSentProto(proto3, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2, 3],
|
||||
[getUuid()]: [1, 2, 3],
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -268,7 +273,7 @@ describe('sql/sendLog', () => {
|
|||
assert.lengthOf(await _getAllSentProtoMessageIds(), 0);
|
||||
assert.lengthOf(await _getAllSentProtoRecipients(), 0);
|
||||
|
||||
const messageId = getGuid();
|
||||
const messageId = getUuid();
|
||||
const timestamp = Date.now();
|
||||
const proto1 = {
|
||||
contentHint: 1,
|
||||
|
|
@ -286,22 +291,22 @@ describe('sql/sendLog', () => {
|
|||
timestamp: timestamp - 20,
|
||||
};
|
||||
await insertSentProto(proto1, {
|
||||
messageIds: [messageId, getGuid()],
|
||||
messageIds: [messageId, getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1, 2],
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1, 2],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
await insertSentProto(proto2, {
|
||||
messageIds: [messageId],
|
||||
recipients: {
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
await insertSentProto(proto3, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[getGuid()]: [1],
|
||||
[getUuid()]: [1],
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -321,15 +326,15 @@ describe('sql/sendLog', () => {
|
|||
it('does not delete payload if recipient remains', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid1 = getGuid();
|
||||
const recipientUuid2 = getGuid();
|
||||
const recipientUuid1 = getUuid();
|
||||
const recipientUuid2 = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid1]: [1, 2],
|
||||
[recipientUuid2]: [1],
|
||||
|
|
@ -352,15 +357,15 @@ describe('sql/sendLog', () => {
|
|||
it('deletes payload if no recipients remain', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid1 = getGuid();
|
||||
const recipientUuid2 = getGuid();
|
||||
const recipientUuid1 = getUuid();
|
||||
const recipientUuid2 = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid1]: [1, 2],
|
||||
[recipientUuid2]: [1],
|
||||
|
|
@ -401,15 +406,15 @@ describe('sql/sendLog', () => {
|
|||
it('deletes multiple recipients in a single transaction', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid1 = getGuid();
|
||||
const recipientUuid2 = getGuid();
|
||||
const recipientUuid1 = getUuid();
|
||||
const recipientUuid2 = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid1]: [1, 2],
|
||||
[recipientUuid2]: [1],
|
||||
|
|
@ -446,8 +451,8 @@ describe('sql/sendLog', () => {
|
|||
it('returns matching payload', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const messageIds = [getGuid(), getGuid()];
|
||||
const recipientUuid = getUuid();
|
||||
const messageIds = [getUuid(), getUuid()];
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
|
|
@ -482,7 +487,7 @@ describe('sql/sendLog', () => {
|
|||
it('returns matching payload with no messageIds', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const recipientUuid = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
|
|
@ -517,14 +522,14 @@ describe('sql/sendLog', () => {
|
|||
it('returns nothing if payload does not have recipient', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const recipientUuid = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid]: [1, 2],
|
||||
},
|
||||
|
|
@ -536,7 +541,7 @@ describe('sql/sendLog', () => {
|
|||
const actual = await getSentProtoByRecipient({
|
||||
now: timestamp,
|
||||
timestamp,
|
||||
recipientUuid: getGuid(),
|
||||
recipientUuid: getUuid(),
|
||||
});
|
||||
|
||||
assert.isUndefined(actual);
|
||||
|
|
@ -545,14 +550,14 @@ describe('sql/sendLog', () => {
|
|||
it('returns nothing if timestamp does not match', async () => {
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const recipientUuid = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid]: [1, 2],
|
||||
},
|
||||
|
|
@ -574,14 +579,14 @@ describe('sql/sendLog', () => {
|
|||
const TWO_DAYS = 2 * 24 * 60 * 60 * 1000;
|
||||
const timestamp = Date.now();
|
||||
|
||||
const recipientUuid = getGuid();
|
||||
const recipientUuid = getUuid();
|
||||
const proto = {
|
||||
contentHint: 1,
|
||||
proto: getRandomBytes(128),
|
||||
timestamp,
|
||||
};
|
||||
await insertSentProto(proto, {
|
||||
messageIds: [getGuid()],
|
||||
messageIds: [getUuid()],
|
||||
recipients: {
|
||||
[recipientUuid]: [1, 2],
|
||||
},
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ describe('sql/stories', () => {
|
|||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const sourceUuid = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const story1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -82,6 +83,7 @@ describe('sql/stories', () => {
|
|||
|
||||
await saveMessages([story1, story2, story3, story4, story5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
|
@ -149,6 +151,8 @@ describe('sql/stories', () => {
|
|||
|
||||
const start = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const story1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -197,6 +201,7 @@ describe('sql/stories', () => {
|
|||
|
||||
await saveMessages([story1, story2, story3, story4, story5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ describe('sql/timelineFetches', () => {
|
|||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -85,6 +87,7 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
await saveMessages([message1, message2, message3, message4, message5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
|
@ -105,6 +108,8 @@ describe('sql/timelineFetches', () => {
|
|||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'story',
|
||||
|
|
@ -135,7 +140,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: now,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -152,6 +160,8 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -180,7 +190,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: target + 10,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -198,6 +211,8 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -226,7 +241,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: target,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -248,6 +266,8 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -276,7 +296,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: target,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -299,6 +322,8 @@ describe('sql/timelineFetches', () => {
|
|||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -349,6 +374,7 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
await saveMessages([message1, message2, message3, message4, message5], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 5);
|
||||
|
|
@ -368,6 +394,8 @@ describe('sql/timelineFetches', () => {
|
|||
const now = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -398,7 +426,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: now + 20,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -416,6 +447,8 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -444,7 +477,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: target + 10,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -462,6 +498,8 @@ describe('sql/timelineFetches', () => {
|
|||
|
||||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const message1: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
body: 'message 1',
|
||||
|
|
@ -490,7 +528,10 @@ describe('sql/timelineFetches', () => {
|
|||
timestamp: target,
|
||||
};
|
||||
|
||||
await saveMessages([message1, message2, message3], { forceSave: true });
|
||||
await saveMessages([message1, message2, message3], {
|
||||
forceSave: true,
|
||||
ourUuid,
|
||||
});
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 3);
|
||||
|
||||
|
|
@ -514,6 +555,7 @@ describe('sql/timelineFetches', () => {
|
|||
const target = Date.now();
|
||||
const conversationId = getUuid();
|
||||
const storyId = getUuid();
|
||||
const ourUuid = getUuid();
|
||||
|
||||
const story: MessageAttributesType = {
|
||||
id: getUuid(),
|
||||
|
|
@ -605,7 +647,7 @@ describe('sql/timelineFetches', () => {
|
|||
newestInStory,
|
||||
newest,
|
||||
],
|
||||
{ forceSave: true }
|
||||
{ forceSave: true, ourUuid }
|
||||
);
|
||||
|
||||
assert.lengthOf(await _getAllMessages(), 8);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue