mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use DurationInSeconds for expireTimer

Browse source
This commit is contained in:
Fedor Indutny 2022-11-16 12:18:02 -08:00 • committed by GitHub
parent cf57c7aaf0
commit 6be69a7ba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 411 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/test-electron/sql/conversationSummary_test.ts
View file

@ -6,6 +6,7 @@ import { assert } from 'chai';
import dataInterface from '../../sql/Client';
import { UUID } from '../../types/UUID';
import type { UUIDStringType } from '../../types/UUID';
import { DurationInSeconds } from '../../util/durations';
import type { MessageAttributesType } from '../../model-types.d';
@ -342,7 +343,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationTimerUpdate: {
expireTimer: 10,
expireTimer: DurationInSeconds.fromSeconds(10),
source: 'you',
},
sent_at: now + 1,
@ -355,7 +356,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationTimerUpdate: {
expireTimer: 10,
expireTimer: DurationInSeconds.fromSeconds(10),
fromSync: true,
},
sent_at: now + 2,
@ -391,7 +392,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationTimerUpdate: {
expireTimer: 10,
expireTimer: DurationInSeconds.fromSeconds(10),
source: 'you',
fromSync: false,
},
@ -405,7 +406,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationTimerUpdate: {
expireTimer: 10,
expireTimer: DurationInSeconds.fromSeconds(10),
fromSync: true,
},
sent_at: now + 2,
@ -450,7 +451,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationStartTimestamp: now - 2 * 1000,
expireTimer: 1,
expireTimer: DurationInSeconds.fromSeconds(1),
sent_at: now + 2,
received_at: now + 2,
timestamp: now + 2,
@ -484,7 +485,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationStartTimestamp: now,
expireTimer: 30,
expireTimer: DurationInSeconds.fromSeconds(30),
sent_at: now + 1,
received_at: now + 1,
timestamp: now + 1,
@ -495,7 +496,7 @@ describe('sql/conversationSummary', () => {
type: 'outgoing',
conversationId,
expirationStartTimestamp: now - 2 * 1000,
expireTimer: 1,
expireTimer: DurationInSeconds.fromSeconds(1),
sent_at: now + 2,
received_at: now + 2,
timestamp: now + 2,

3
ts/test-electron/sql/markRead_test.ts
View file

@ -8,6 +8,7 @@ import { UUID } from '../../types/UUID';
import type { UUIDStringType } from '../../types/UUID';
import type { ReactionType } from '../../types/Reactions';
import { DurationInSeconds } from '../../util/durations';
import type { MessageAttributesType } from '../../model-types.d';
import { ReadStatus } from '../../messages/MessageReadStatus';
@ -331,7 +332,7 @@ describe('sql/markRead', () => {
const start = Date.now();
const readAt = start + 20;
const conversationId = getUuid();
const expireTimer = 15;
const expireTimer = DurationInSeconds.fromSeconds(15);
const ourUuid = getUuid();
const message1: MessageAttributesType = {

6
ts/test-electron/state/ducks/stories_test.ts
View file

@ -12,7 +12,7 @@ import type { ConversationType } from '../../../state/ducks/conversations';
import type { MessageAttributesType } from '../../../model-types.d';
import type { StateType as RootStateType } from '../../../state/reducer';
import type { UUIDStringType } from '../../../types/UUID';
import { DAY } from '../../../util/durations';
import { DurationInSeconds } from '../../../util/durations';
import { TEXT_ATTACHMENT, IMAGE_JPEG } from '../../../types/MIME';
import { ReadStatus } from '../../../messages/MessageReadStatus';
import {
@ -74,7 +74,7 @@ describe('both/state/ducks/stories', () => {
return {
conversationId,
expirationStartTimestamp: now,
expireTimer: 1 * DAY,
expireTimer: DurationInSeconds.DAY,
messageId,
readStatus: ReadStatus.Unread,
timestamp: now - timestampDelta,
@ -538,7 +538,7 @@ describe('both/state/ducks/stories', () => {
? ourConversationId
: groupConversationId,
expirationStartTimestamp: now,
expireTimer: 1 * DAY,
expireTimer: DurationInSeconds.DAY,
messageId,
readStatus: ReadStatus.Unread,
sendStateByConversationId: {},