From 406938cf5973d8654b5ccc763cc611c312bd4d0d Mon Sep 17 00:00:00 2001 From: Beaudan <beau@loki.network> Date: Tue, 6 Aug 2019 12:05:54 +1000 Subject: [PATCH] Cleaner forceSave --- js/models/messages.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/js/models/messages.js b/js/models/messages.js index b5204c504..cc6c885ef 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -2014,18 +2014,11 @@ } else { await conversation.onFriendRequestAccepted(); } - let id; // Force save if the message already has an id, used for public channels - if (message.id) { - id = await window.Signal.Data.saveMessage(message.attributes, { - forceSave: true, - Message: Whisper.Message, - }); - } else { - id = await window.Signal.Data.saveMessage(message.attributes, { - Message: Whisper.Message, - }); - } + const id = await window.Signal.Data.saveMessage(message.attributes, { + forceSave: !!message.id, + Message: Whisper.Message, + }); message.set({ id }); MessageController.register(message.id, message);