|
|
|
@ -59,9 +59,7 @@ export async function destroyMessagesAndUpdateRedux(
|
|
|
|
|
|
|
|
|
|
|
|
// trigger a refresh the last message for all those uniq conversation
|
|
|
|
// trigger a refresh the last message for all those uniq conversation
|
|
|
|
conversationWithChanges.forEach(convoIdToUpdate => {
|
|
|
|
conversationWithChanges.forEach(convoIdToUpdate => {
|
|
|
|
ConvoHub.use()
|
|
|
|
ConvoHub.use().get(convoIdToUpdate)?.updateLastMessage();
|
|
|
|
.get(convoIdToUpdate)
|
|
|
|
|
|
|
|
?.updateLastMessage();
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -91,12 +89,8 @@ async function destroyExpiredMessages() {
|
|
|
|
window.log.info('destroyExpiredMessages: convosToRefresh:', convosToRefresh);
|
|
|
|
window.log.info('destroyExpiredMessages: convosToRefresh:', convosToRefresh);
|
|
|
|
await Promise.all(
|
|
|
|
await Promise.all(
|
|
|
|
convosToRefresh.map(async c => {
|
|
|
|
convosToRefresh.map(async c => {
|
|
|
|
ConvoHub.use()
|
|
|
|
ConvoHub.use().get(c)?.updateLastMessage();
|
|
|
|
.get(c)
|
|
|
|
return ConvoHub.use().get(c)?.refreshInMemoryDetails();
|
|
|
|
?.updateLastMessage();
|
|
|
|
|
|
|
|
return ConvoHub.use()
|
|
|
|
|
|
|
|
.get(c)
|
|
|
|
|
|
|
|
?.refreshInMemoryDetails();
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
);
|
|
|
|
);
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
|
@ -278,9 +272,7 @@ function changeToDisappearingMessageType(
|
|
|
|
* This should only be used for DataExtractionNotification and CallMessages (the ones saved to the DB) currently.
|
|
|
|
* This should only be used for DataExtractionNotification and CallMessages (the ones saved to the DB) currently.
|
|
|
|
* Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right)
|
|
|
|
* Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right)
|
|
|
|
* */
|
|
|
|
* */
|
|
|
|
function forcedDeleteAfterReadMsgSetting(
|
|
|
|
function forcedDeleteAfterReadMsgSetting(convo: ConversationModel): {
|
|
|
|
convo: ConversationModel
|
|
|
|
|
|
|
|
): {
|
|
|
|
|
|
|
|
expirationType: Exclude<DisappearingMessageType, 'deleteAfterSend'>;
|
|
|
|
expirationType: Exclude<DisappearingMessageType, 'deleteAfterSend'>;
|
|
|
|
expireTimer: number;
|
|
|
|
expireTimer: number;
|
|
|
|
} {
|
|
|
|
} {
|
|
|
|
@ -307,9 +299,7 @@ function forcedDeleteAfterReadMsgSetting(
|
|
|
|
* This should only be used for the outgoing CallMessages that we keep locally only (not synced, just the "you started a call" notification)
|
|
|
|
* This should only be used for the outgoing CallMessages that we keep locally only (not synced, just the "you started a call" notification)
|
|
|
|
* Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right)
|
|
|
|
* Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right)
|
|
|
|
* */
|
|
|
|
* */
|
|
|
|
function forcedDeleteAfterSendMsgSetting(
|
|
|
|
function forcedDeleteAfterSendMsgSetting(convo: ConversationModel): {
|
|
|
|
convo: ConversationModel
|
|
|
|
|
|
|
|
): {
|
|
|
|
|
|
|
|
expirationType: Exclude<DisappearingMessageType, 'deleteAfterRead'>;
|
|
|
|
expirationType: Exclude<DisappearingMessageType, 'deleteAfterRead'>;
|
|
|
|
expireTimer: number;
|
|
|
|
expireTimer: number;
|
|
|
|
} {
|
|
|
|
} {
|
|
|
|
@ -365,7 +355,8 @@ async function checkForExpireUpdateInContentMessage(
|
|
|
|
): Promise<DisappearingMessageUpdate | undefined> {
|
|
|
|
): Promise<DisappearingMessageUpdate | undefined> {
|
|
|
|
const dataMessage = content.dataMessage as SignalService.DataMessage | undefined;
|
|
|
|
const dataMessage = content.dataMessage as SignalService.DataMessage | undefined;
|
|
|
|
// We will only support legacy disappearing messages for a short period before disappearing messages v2 is unlocked
|
|
|
|
// We will only support legacy disappearing messages for a short period before disappearing messages v2 is unlocked
|
|
|
|
const isDisappearingMessagesV2Released = await ReleasedFeatures.checkIsDisappearMessageV2FeatureReleased();
|
|
|
|
const isDisappearingMessagesV2Released =
|
|
|
|
|
|
|
|
await ReleasedFeatures.checkIsDisappearMessageV2FeatureReleased();
|
|
|
|
|
|
|
|
|
|
|
|
const couldBeLegacyContentMessage = couldBeLegacyDisappearingMessageContent(content);
|
|
|
|
const couldBeLegacyContentMessage = couldBeLegacyDisappearingMessageContent(content);
|
|
|
|
const isLegacyDataMessage =
|
|
|
|
const isLegacyDataMessage =
|
|
|
|
@ -565,9 +556,9 @@ function getMessageReadyToDisappear(
|
|
|
|
if (msgExpirationWasAlreadyUpdated) {
|
|
|
|
if (msgExpirationWasAlreadyUpdated) {
|
|
|
|
const expirationStartTimestamp = messageExpirationFromRetrieve - expireTimer * 1000;
|
|
|
|
const expirationStartTimestamp = messageExpirationFromRetrieve - expireTimer * 1000;
|
|
|
|
window.log.debug(
|
|
|
|
window.log.debug(
|
|
|
|
`incoming DaR message already read by another device, forcing readAt ${(Date.now() -
|
|
|
|
`incoming DaR message already read by another device, forcing readAt ${
|
|
|
|
expirationStartTimestamp) /
|
|
|
|
(Date.now() - expirationStartTimestamp) / 1000
|
|
|
|
1000}s ago, so with ${(messageExpirationFromRetrieve - Date.now()) / 1000}s left`
|
|
|
|
}s ago, so with ${(messageExpirationFromRetrieve - Date.now()) / 1000}s left`
|
|
|
|
);
|
|
|
|
);
|
|
|
|
messageModel.set({
|
|
|
|
messageModel.set({
|
|
|
|
expirationStartTimestamp,
|
|
|
|
expirationStartTimestamp,
|
|
|
|
|
Audric Ackermann
1 year ago