From 8d36442dbfe7aad5482b6129210ed0c017788cb3 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 13 Oct 2023 16:03:13 +1100 Subject: [PATCH] refactor: rename ttl_max to content_message this is more explicit --- ts/session/constants.ts | 2 +- ts/session/messages/outgoing/ContentMessage.ts | 2 +- ts/session/messages/outgoing/ExpirableMessage.ts | 6 +++--- ts/test/session/unit/messages/ChatMessage_test.ts | 2 +- .../session/unit/messages/ConfigurationMessage_test.ts | 2 +- .../session/unit/messages/GroupInvitationMessage_test.ts | 2 +- .../session/unit/messages/MessageRequestResponse_test.ts | 2 +- ts/test/session/unit/messages/ReceiptMessage_test.ts | 4 ++-- .../messages/closed_groups/ClosedGroupChatMessage_test.ts | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ts/session/constants.ts b/ts/session/constants.ts index e74cb2c7e..01921d0de 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -21,7 +21,7 @@ export const TTL_DEFAULT = { /** 5 minutes */ CALL_MESSAGE: 5 * 60 * DURATION.SECONDS, /** 14 days */ - TTL_MAX: 14 * DURATION.DAYS, + CONTENT_MESSAGE: 14 * DURATION.DAYS, /** 30 days */ CONFIG_MESSAGE: 30 * DURATION.DAYS, }; diff --git a/ts/session/messages/outgoing/ContentMessage.ts b/ts/session/messages/outgoing/ContentMessage.ts index a43e06de6..f1d445767 100644 --- a/ts/session/messages/outgoing/ContentMessage.ts +++ b/ts/session/messages/outgoing/ContentMessage.ts @@ -8,7 +8,7 @@ export abstract class ContentMessage extends Message { } public ttl(): number { - return TTL_DEFAULT.TTL_MAX; + return TTL_DEFAULT.CONTENT_MESSAGE; } public abstract contentProto(): SignalService.Content; diff --git a/ts/session/messages/outgoing/ExpirableMessage.ts b/ts/session/messages/outgoing/ExpirableMessage.ts index 81d29ca22..02377ba85 100644 --- a/ts/session/messages/outgoing/ExpirableMessage.ts +++ b/ts/session/messages/outgoing/ExpirableMessage.ts @@ -57,11 +57,11 @@ export class ExpirableMessage extends ContentMessage { public ttl(): number { switch (this.expirationType) { case 'deleteAfterSend': - return this.expireTimer ? this.expireTimer * DURATION.SECONDS : TTL_DEFAULT.TTL_MAX; + return this.expireTimer ? this.expireTimer * DURATION.SECONDS : TTL_DEFAULT.CONTENT_MESSAGE; case 'deleteAfterRead': - return TTL_DEFAULT.TTL_MAX; + return TTL_DEFAULT.CONTENT_MESSAGE; default: - return TTL_DEFAULT.TTL_MAX; + return TTL_DEFAULT.CONTENT_MESSAGE; } } } diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts index d7c1b5f53..880f60031 100644 --- a/ts/test/session/unit/messages/ChatMessage_test.ts +++ b/ts/test/session/unit/messages/ChatMessage_test.ts @@ -154,7 +154,7 @@ describe('VisibleMessage', () => { const message = new VisibleMessage({ timestamp: Date.now(), }); - expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); + expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.CONTENT_MESSAGE); }); it('has an identifier', () => { diff --git a/ts/test/session/unit/messages/ConfigurationMessage_test.ts b/ts/test/session/unit/messages/ConfigurationMessage_test.ts index ca541a776..e0d86073e 100644 --- a/ts/test/session/unit/messages/ConfigurationMessage_test.ts +++ b/ts/test/session/unit/messages/ConfigurationMessage_test.ts @@ -65,7 +65,7 @@ describe('ConfigurationMessage', () => { contacts: [], }; const configMessage = new ConfigurationMessage(params); - expect(configMessage.ttl()).to.be.equal(TTL_DEFAULT.TTL_MAX); + expect(configMessage.ttl()).to.be.equal(TTL_DEFAULT.CONTENT_MESSAGE); }); describe('ConfigurationMessageClosedGroup', () => { diff --git a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts index ba40c6d8a..591c84398 100644 --- a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts +++ b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts @@ -28,7 +28,7 @@ describe('GroupInvitationMessage', () => { }); it('correct ttl', () => { - expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); + expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.CONTENT_MESSAGE); }); it('has an identifier', () => { diff --git a/ts/test/session/unit/messages/MessageRequestResponse_test.ts b/ts/test/session/unit/messages/MessageRequestResponse_test.ts index 6473a562b..744ac32ad 100644 --- a/ts/test/session/unit/messages/MessageRequestResponse_test.ts +++ b/ts/test/session/unit/messages/MessageRequestResponse_test.ts @@ -12,7 +12,7 @@ describe('MessageRequestResponse', () => { timestamp: Date.now(), }); - expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); + expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.CONTENT_MESSAGE); }); it('has an identifier', () => { diff --git a/ts/test/session/unit/messages/ReceiptMessage_test.ts b/ts/test/session/unit/messages/ReceiptMessage_test.ts index 977f94699..425d6cc78 100644 --- a/ts/test/session/unit/messages/ReceiptMessage_test.ts +++ b/ts/test/session/unit/messages/ReceiptMessage_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { beforeEach } from 'mocha'; import { toNumber } from 'lodash'; +import { beforeEach } from 'mocha'; import { SignalService } from '../../../../protobuf'; import { Constants } from '../../../../session'; @@ -26,7 +26,7 @@ describe('ReceiptMessage', () => { }); it('correct ttl', () => { - expect(readMessage.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); + expect(readMessage.ttl()).to.equal(Constants.TTL_DEFAULT.CONTENT_MESSAGE); }); it('has an identifier', () => { diff --git a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts index c822c4caf..8e0cfa84c 100644 --- a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts @@ -1,12 +1,12 @@ import { expect } from 'chai'; import { SignalService } from '../../../../../protobuf'; -import { TestUtils } from '../../../../test-utils'; -import { StringUtils } from '../../../../../session/utils'; -import { PubKey } from '../../../../../session/types'; import { Constants } from '../../../../../session'; import { ClosedGroupVisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { VisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/VisibleMessage'; +import { PubKey } from '../../../../../session/types'; +import { StringUtils } from '../../../../../session/utils'; +import { TestUtils } from '../../../../test-utils'; describe('ClosedGroupVisibleMessage', () => { let groupId: PubKey; @@ -54,7 +54,7 @@ describe('ClosedGroupVisibleMessage', () => { timestamp, chatMessage, }); - expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); + expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.CONTENT_MESSAGE); }); it('has an identifier', () => {