From 7b1f23b0ba5832ced4fa01fa226ec62ba05e401d Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:06:45 -0600 Subject: [PATCH] modifyTargetMessage: Save other changes before applying edits Co-authored-by: Scott Nonnenberg --- ts/util/modifyTargetMessage.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ts/util/modifyTargetMessage.ts b/ts/util/modifyTargetMessage.ts index 104f2bb35c..67477eb217 100644 --- a/ts/util/modifyTargetMessage.ts +++ b/ts/util/modifyTargetMessage.ts @@ -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, - }); - } }