From 92c071e083022553ba7404490a4c6d74dc69157a Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 28 Jan 2019 15:24:19 -0800 Subject: [PATCH] Use the proper method for pulling attachments off disk for retry --- js/modules/signal.js | 4 ++-- js/modules/types/message.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/modules/signal.js b/js/modules/signal.js index 4445d8de74..ded0e63ba0 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -124,8 +124,8 @@ function initializeMigrations({ const attachmentsPath = getPath(userDataPath); const readAttachmentData = createReader(attachmentsPath); const loadAttachmentData = Type.loadData(readAttachmentData); - const loadPreviewData = MessageType.loadPreviewData(readAttachmentData); - const loadQuoteData = MessageType.loadQuoteData(readAttachmentData); + const loadPreviewData = MessageType.loadPreviewData(loadAttachmentData); + const loadQuoteData = MessageType.loadQuoteData(loadAttachmentData); const getAbsoluteAttachmentPath = createAbsolutePathGetter(attachmentsPath); const deleteOnDisk = Attachments.createDeleter(attachmentsPath); diff --git a/js/modules/types/message.js b/js/modules/types/message.js index 4d558572a5..405092b37c 100644 --- a/js/modules/types/message.js +++ b/js/modules/types/message.js @@ -469,14 +469,14 @@ exports.loadPreviewData = loadAttachmentData => { } return Promise.all( - preview.map(async () => { - if (!preview.image) { - return preview; + preview.map(async item => { + if (!item.image) { + return item; } return { - ...preview, - image: await loadAttachmentData(preview.image), + ...item, + image: await loadAttachmentData(item.image), }; }) );