Always respect DOE from your own devices
This commit is contained in:
parent
5dc42122a8
commit
f735a9cfa7
|
@ -1,25 +1,24 @@
|
||||||
// Copyright 2020 Signal Messenger, LLC
|
// Copyright 2020-2022 Signal Messenger, LLC
|
||||||
// SPDX-License-Identifier: AGPL-3.0-only
|
// SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
import type { DeleteModel } from '../messageModifiers/Deletes';
|
import type { DeleteModel } from '../messageModifiers/Deletes';
|
||||||
import type { MessageModel } from '../models/messages';
|
import type { MessageModel } from '../models/messages';
|
||||||
import * as log from '../logging/log';
|
import * as log from '../logging/log';
|
||||||
import { DAY } from './durations';
|
import { DAY } from './durations';
|
||||||
|
import { getContactId } from '../messages/helpers';
|
||||||
|
|
||||||
export async function deleteForEveryone(
|
export async function deleteForEveryone(
|
||||||
message: MessageModel,
|
message: MessageModel,
|
||||||
doe: DeleteModel,
|
doe: DeleteModel,
|
||||||
shouldPersist = true
|
shouldPersist = true
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const messageTimestamp =
|
if (isDeletionByMe(message, doe)) {
|
||||||
message.get('serverTimestamp') || message.get('sent_at') || 0;
|
await message.handleDeleteForEveryone(doe, shouldPersist);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Make sure the server timestamps for the DOE and the matching message
|
if (isDeletionTooOld(message, doe)) {
|
||||||
// are less than one day apart
|
log.warn('Received late DOE. Dropping.', {
|
||||||
const delta = Math.abs(doe.get('serverTimestamp') - messageTimestamp);
|
|
||||||
|
|
||||||
if (delta > DAY) {
|
|
||||||
log.info('Received late DOE. Dropping.', {
|
|
||||||
fromId: doe.get('fromId'),
|
fromId: doe.get('fromId'),
|
||||||
targetSentTimestamp: doe.get('targetSentTimestamp'),
|
targetSentTimestamp: doe.get('targetSentTimestamp'),
|
||||||
messageServerTimestamp: message.get('serverTimestamp'),
|
messageServerTimestamp: message.get('serverTimestamp'),
|
||||||
|
@ -31,3 +30,25 @@ export async function deleteForEveryone(
|
||||||
|
|
||||||
await message.handleDeleteForEveryone(doe, shouldPersist);
|
await message.handleDeleteForEveryone(doe, shouldPersist);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isDeletionByMe(
|
||||||
|
message: Readonly<MessageModel>,
|
||||||
|
doe: Readonly<DeleteModel>
|
||||||
|
): boolean {
|
||||||
|
const ourConversationId =
|
||||||
|
window.ConversationController.getOurConversationIdOrThrow();
|
||||||
|
return (
|
||||||
|
getContactId(message.attributes) === ourConversationId &&
|
||||||
|
doe.get('fromId') === ourConversationId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isDeletionTooOld(
|
||||||
|
message: Readonly<MessageModel>,
|
||||||
|
doe: Readonly<DeleteModel>
|
||||||
|
): boolean {
|
||||||
|
const messageTimestamp =
|
||||||
|
message.get('serverTimestamp') || message.get('sent_at') || 0;
|
||||||
|
const delta = Math.abs(doe.get('serverTimestamp') - messageTimestamp);
|
||||||
|
return delta > DAY;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue