modifyTargetMessage: Save other changes before applying edits

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2024-02-12 14:14:30 -06:00 committed by GitHub
parent 54d1da5efe
commit 7eb9bafd25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -250,6 +250,14 @@ export async function modifyTargetMessage(
})
);
// We save here before handling any edits because handleEditMessage does its own saves
if (changed && !isFirstRun) {
log.info(`${logId}: Changes in second run; saving.`);
await window.Signal.Data.saveMessage(message.attributes, {
ourAci,
});
}
// We want to make sure the message is saved first before applying any edits
if (!isFirstRun && !skipEdits) {
const edits = Edits.forMessage(message.attributes);
@ -262,11 +270,4 @@ export async function modifyTargetMessage(
)
);
}
if (changed && !isFirstRun) {
log.info(`${logId}: Changes in second run; saving.`);
await window.Signal.Data.saveMessage(message.attributes, {
ourAci,
});
}
}