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

Do not confirm messages until we have handled them

Browse source
This commit is contained in:
Josh Perez 2023-08-21 16:08:27 -04:00 • committed by GitHub
parent 29aa188c0f
commit 04f716986c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 990 additions and 960 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ts/messageModifiers/Deletes.ts
View file

@ -7,7 +7,6 @@ import * as log from '../logging/log';
import * as Errors from '../types/errors';
import { deleteForEveryone } from '../util/deleteForEveryone';
import { drop } from '../util/drop';
import { filter, size } from '../util/iterables';
import { getMessageSentTimestampSet } from '../util/getMessageSentTimestampSet';
export type DeleteAttributesType = {
@ -20,28 +19,33 @@ export type DeleteAttributesType = {
const deletes = new Map<string, DeleteAttributesType>();
function remove(del: DeleteAttributesType): void {
del.removeFromMessageReceiverCache();
deletes.delete(del.envelopeId);
}
export function forMessage(
messageAttributes: MessageAttributesType
): Array<DeleteAttributesType> {
const sentTimestamps = getMessageSentTimestampSet(messageAttributes);
const matchingDeletes = filter(deletes, ([_envelopeId, item]) => {
const deleteValues = Array.from(deletes.values());
const matchingDeletes = deleteValues.filter(item => {
return (
item.fromId === getContactId(messageAttributes) &&
sentTimestamps.has(item.targetSentTimestamp)
);
});
if (size(matchingDeletes) > 0) {
log.info('Found early DOE for message');
const result = Array.from(matchingDeletes);
result.forEach(([envelopeId, del]) => {
del.removeFromMessageReceiverCache();
deletes.delete(envelopeId);
});
return result.map(([_envelopeId, item]) => item);
if (!matchingDeletes.length) {
return [];
}
return [];
log.info('Found early DOE for message');
matchingDeletes.forEach(del => {
remove(del);
});
return matchingDeletes;
}
export async function onDelete(del: DeleteAttributesType): Promise<void> {
@ -88,11 +92,11 @@ export async function onDelete(del: DeleteAttributesType): Promise<void> {
await deleteForEveryone(message, del);
deletes.delete(del.envelopeId);
del.removeFromMessageReceiverCache();
remove(del);
})
);
} catch (error) {
remove(del);
log.error(`${logId}: error`, Errors.toLogFormat(error));
}
}