@ -354,16 +354,12 @@ describe('DisappearingMessage', () => {
expect ( expireUpdate ? . expirationType , 'expirationType should be unknown' ) . to . equal ( 'unknown' ) ;
expect ( expireUpdate ? . expirationTimer , 'expirationTimer should be 0' ) . to . equal ( 0 ) ;
expect (
expireUpdate ? . lastDisappearingMessageChangeTimestamp ,
'lastDisappearingMessageChangeTimestamp should be 0'
) . to . equal ( 0 ) ;
expect (
expireUpdate ? . isLegacyConversationSettingMessage ,
'isLegacyConversationSettingMessage should be false'
) . to . be . false ;
expect ( expireUpdate ? . isLegacyDataMessage , 'isLegacyDataMessage should be false' ) . to . be . false ;
expect ( expireUpdate ? . isOutdated , 'isOutdated should be undefined' ) . to . be . undefined ;
} ) ;
it ( 'if we receive a deleteAfterRead message after 1 minute then it returns those values' , async ( ) = > {
const disappearingMessage = generateDisappearingVisibleMessage ( {
@ -387,26 +383,20 @@ describe('DisappearingMessage', () => {
'deleteAfterRead'
) ;
expect ( expireUpdate ? . expirationTimer , 'expirationTimer should be 60' ) . to . equal ( 60 ) ;
expect (
expireUpdate ? . lastDisappearingMessageChangeTimestamp ,
'lastDisappearingMessageChangeTimestamp should be 0'
) . to . equal ( 0 ) ;
expect (
expireUpdate ? . isLegacyConversationSettingMessage ,
'isLegacyConversationSettingMessage should be false'
) . to . be . false ;
expect ( expireUpdate ? . isLegacyDataMessage , 'isLegacyDataMessage should be false' ) . to . be . false ;
expect ( expireUpdate ? . isOutdated , 'isOutdated should be undefined' ) . to . be . undefined ;
} ) ;
it ( 'if we receive an ExpirationTimerUpdate message for deleteAfterSend after 5 minutes then it returns those values' , async ( ) = > {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime . getNowWithNetworkOffset ( ) ;
const expirationTimerUpdateMessage = generateDisappearingVisibleMessage ( {
expirationType : 'deleteAfterSend' ,
expireTimer : 300 ,
expirationTimerUpdate : {
expirationType : 'deleteAfterSend' ,
expireTimer : 300 ,
lastDisappearingMessageChangeTimestamp ,
source : testPubkey ,
} ,
} ) ;
@ -427,33 +417,26 @@ describe('DisappearingMessage', () => {
'deleteAfterSend'
) ;
expect ( expireUpdate ? . expirationTimer , 'expirationTimer should be 300' ) . to . equal ( 300 ) ;
expect (
expireUpdate ? . lastDisappearingMessageChangeTimestamp ,
'lastDisappearingMessageChangeTimestamp should match input value'
) . to . equal ( lastDisappearingMessageChangeTimestamp ) ;
expect (
expireUpdate ? . isLegacyConversationSettingMessage ,
'isLegacyConversationSettingMessage should be false'
) . to . be . false ;
expect ( expireUpdate ? . isLegacyDataMessage , 'isLegacyDataMessage should be false' ) . to . be . false ;
expect ( expireUpdate ? . isOutdated , 'isOutdated should be undefined' ) . to . be . undefined ;
} ) ;
it ( 'if we receive an outdated ExpirationTimerUpdate message then it should be ignored and is outdated' , async ( ) = > {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime . getNowWithNetworkOffset ( ) ;
const expirationTimerUpdateMessage = generateDisappearingVisibleMessage ( {
expirationType : 'deleteAfterSend' ,
expireTimer : 300 ,
expirationTimerUpdate : {
expirationType : 'deleteAfterSend' ,
expireTimer : 300 ,
lastDisappearingMessageChangeTimestamp : lastDisappearingMessageChangeTimestamp - 20000 ,
source : testPubkey ,
} ,
} ) ;
const convoToUpdate = new ConversationModel ( {
. . . conversationArgs ,
lastDisappearingMessageChangeTimestamp ,
} ) ;
// TODO legacy messages support will be removed in a future release
Sinon . stub ( ReleasedFeatures , 'checkIsDisappearMessageV2FeatureReleased' ) . resolves ( true ) ;
@ -468,17 +451,13 @@ describe('DisappearingMessage', () => {
'deleteAfterSend'
) ;
expect ( expireUpdate ? . expirationTimer , 'expirationTimer should be 300' ) . to . equal ( 300 ) ;
expect (
expireUpdate ? . lastDisappearingMessageChangeTimestamp ,
'lastDisappearingMessageChangeTimestamp should be undefined'
) . to . equal ( undefined ) ;
expect (
expireUpdate ? . isLegacyConversationSettingMessage ,
'isLegacyConversationSettingMessage should be undefined'
) . to . be . undefined ;
expect ( expireUpdate ? . isLegacyDataMessage , 'isLegacyDataMessage should be undefined' ) . to . be
. undefined ;
expect ( expireUpdate ? . isOutdated , 'isOutdated should be true' ) . to . be . true ;
} ) ;
} ) ;
@ -578,34 +557,13 @@ describe('DisappearingMessage', () => {
const updateSuccess = await conversation . updateExpireTimer ( {
providedDisappearingMode : 'deleteAfterSend' ,
providedExpireTimer : 600 ,
providedChangeTimestamp : GetNetworkTime.getNowWithNetworkOffset ( ) ,
fromSync : false , // if the update comes from a config or sync message
shouldCommitConvo : false ,
existingMessage : undefined ,
} ) ;
expect ( updateSuccess , 'should be false' ) . to . be . false ;
} ) ;
it ( 'if the lastDisappearingMessageChangeTimestamp is outdated we ignore it' , async ( ) = > {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime . getNowWithNetworkOffset ( ) ;
const conversation = new ConversationModel ( {
. . . conversationArgs ,
} ) ;
conversation . set ( {
expirationMode : 'deleteAfterRead' ,
expireTimer : 60 ,
lastDisappearingMessageChangeTimestamp : lastDisappearingMessageChangeTimestamp + 20000 ,
} ) ;
const updateSuccess = await conversation . updateExpireTimer ( {
providedDisappearingMode : 'deleteAfterSend' ,
providedExpireTimer : 600 ,
providedChangeTimestamp : lastDisappearingMessageChangeTimestamp ,
fromSync : false ,
shouldCommitConvo : false ,
existingMessage : undefined ,
} ) ;
expect ( updateSuccess , 'should be false' ) . to . be . false ;
} ) ;
it ( 'if we receive the same settings we ignore it' , async ( ) = > {
const conversation = new ConversationModel ( {
. . . conversationArgs ,
@ -618,7 +576,6 @@ describe('DisappearingMessage', () => {
const updateSuccess = await conversation . updateExpireTimer ( {
providedDisappearingMode : 'deleteAfterRead' ,
providedExpireTimer : 60 ,
providedChangeTimestamp : GetNetworkTime.getNowWithNetworkOffset ( ) ,
fromSync : false ,
shouldCommitConvo : false ,
existingMessage : undefined ,
@ -626,7 +583,6 @@ describe('DisappearingMessage', () => {
expect ( updateSuccess , 'should be false' ) . to . be . false ;
} ) ;
it ( "if an update is successful then the conversation should have it's settings updated" , async ( ) = > {
const lastDisappearingMessageChangeTimestamp = GetNetworkTime . getNowWithNetworkOffset ( ) ;
const conversation = new ConversationModel ( {
. . . conversationArgs ,
} ) ;
@ -638,7 +594,6 @@ describe('DisappearingMessage', () => {
const updateSuccess = await conversation . updateExpireTimer ( {
providedDisappearingMode : 'deleteAfterSend' ,
providedExpireTimer : 600 ,
providedChangeTimestamp : lastDisappearingMessageChangeTimestamp ,
providedSource : testPubkey ,
receivedAt : GetNetworkTime.getNowWithNetworkOffset ( ) ,
fromSync : true ,
@ -652,10 +607,6 @@ describe('DisappearingMessage', () => {
'expirationMode should be deleteAfterSend'
) . to . equal ( 'deleteAfterSend' ) ;
expect ( conversation . getExpireTimer ( ) , 'expireTimer should be 5 minutes' ) . to . equal ( 600 ) ;
expect (
conversation . getLastDisappearingMessageChangeTimestamp ( ) ,
'lastDisappearingMessageChangeTimestamp should match the input value'
) . to . equal ( lastDisappearingMessageChangeTimestamp ) ;
} ) ;
} ) ;
} ) ;
@ -666,7 +617,6 @@ describe('DisappearingMessage', () => {
const expirationTimerUpdateMessage = generateFakeExpirationTimerUpdate ( {
expirationType : 'deleteAfterSend' ,
expireTimer : 300 ,
lastDisappearingMessageChangeTimestamp : GetNetworkTime.getNowWithNetworkOffset ( ) ,
source : testPubkey ,
} ) ;
Audric Ackermann
5 months ago