From 4c4443390a7afccbcba4f124d00c86be076a6c00 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 4 Apr 2018 18:57:18 -0400
Subject: [PATCH] Rename `createImporter` to `createAttachmentDataWriter`

---
 js/modules/backup.js               |  4 ++--
 js/modules/types/message.js        |  8 ++++----
 preload.js                         |  4 ++--
 test/modules/types/message_test.js | 11 +++++++----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/js/modules/backup.js b/js/modules/backup.js
index 481053fc5..0f9197735 100644
--- a/js/modules/backup.js
+++ b/js/modules/backup.js
@@ -824,9 +824,9 @@ async function saveAllMessages(db, rawMessages) {
     return Promise.resolve();
   }
 
-  const { importMessage, upgradeMessageSchema } = Signal.Migrations;
+  const { writeMessageAttachments, upgradeMessageSchema } = Signal.Migrations;
   const importAndUpgrade = async message =>
-    upgradeMessageSchema(await importMessage(message));
+    upgradeMessageSchema(await writeMessageAttachments(message));
 
   const messages = await Promise.all(rawMessages.map(importAndUpgrade));
 
diff --git a/js/modules/types/message.js b/js/modules/types/message.js
index c9083107a..ff1b1adac 100644
--- a/js/modules/types/message.js
+++ b/js/modules/types/message.js
@@ -187,10 +187,10 @@ exports.createAttachmentLoader = (loadAttachmentData) => {
   }));
 };
 
-//      createImporter :: (RelativePath -> IO Unit)
-//                        Message ->
-//                        IO (Promise Message)
-exports.createImporter = (writeExistingAttachmentData) => {
+//      createAttachmentDataWriter :: (RelativePath -> IO Unit)
+//                                    Message ->
+//                                    IO (Promise Message)
+exports.createAttachmentDataWriter = (writeExistingAttachmentData) => {
   if (!isFunction(writeExistingAttachmentData)) {
     throw new TypeError('"writeExistingAttachmentData" must be a function');
   }
diff --git a/preload.js b/preload.js
index ce60d1f46..c541ea04e 100644
--- a/preload.js
+++ b/preload.js
@@ -140,8 +140,8 @@ window.Signal.Migrations = {};
 window.Signal.Migrations.deleteAttachmentData =
   Attachment.deleteData(deleteAttachmentData);
 window.Signal.Migrations.getPlaceholderMigrations = getPlaceholderMigrations;
-window.Signal.Migrations.importMessage =
-  Message.createImporter(writeExistingAttachmentData);
+window.Signal.Migrations.writeMessageAttachments =
+  Message.createAttachmentDataWriter(writeExistingAttachmentData);
 window.Signal.Migrations.loadAttachmentData = loadAttachmentData;
 window.Signal.Migrations.loadMessage = Message.createAttachmentLoader(loadAttachmentData);
 window.Signal.Migrations.Migrations0DatabaseWithAttachmentData =
diff --git a/test/modules/types/message_test.js b/test/modules/types/message_test.js
index 6c9112e19..c9c4b5881 100644
--- a/test/modules/types/message_test.js
+++ b/test/modules/types/message_test.js
@@ -5,7 +5,7 @@ const { stringToArrayBuffer } = require('../../../js/modules/string_to_array_buf
 
 
 describe('Message', () => {
-  describe('createImporter', () => {
+  describe('createAttachmentDataWriter', () => {
     it('should ignore messages that didn’t go through attachment migration', async () => {
       const input = {
         body: 'Imagine there is no heaven…',
@@ -17,7 +17,8 @@ describe('Message', () => {
       };
       const writeExistingAttachmentData = () => {};
 
-      const actual = await Message.createImporter(writeExistingAttachmentData)(input);
+      const actual =
+        await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
       assert.deepEqual(actual, expected);
     });
 
@@ -34,7 +35,8 @@ describe('Message', () => {
       };
       const writeExistingAttachmentData = () => {};
 
-      const actual = await Message.createImporter(writeExistingAttachmentData)(input);
+      const actual =
+        await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
       assert.deepEqual(actual, expected);
     });
 
@@ -60,7 +62,8 @@ describe('Message', () => {
         assert.deepEqual(attachment.data, stringToArrayBuffer('It’s easy if you try'));
       };
 
-      const actual = await Message.createImporter(writeExistingAttachmentData)(input);
+      const actual =
+        await Message.createAttachmentDataWriter(writeExistingAttachmentData)(input);
       assert.deepEqual(actual, expected);
     });
   });