From eb116e587ee5177710bd16df9c32e679d57e50d3 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Tue, 9 Jun 2020 13:30:48 +1000
Subject: [PATCH] simplified conversion to buffer

---
 ts/session/sending/PendingMessageCache.ts | 32 +++++++----------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts
index 43c84cd4a..30bfe35d6 100644
--- a/ts/session/sending/PendingMessageCache.ts
+++ b/ts/session/sending/PendingMessageCache.ts
@@ -1,7 +1,4 @@
-import {
-  createOrUpdateItem,
-  getItemById,
-} from '../../../js/modules/data';
+import { createOrUpdateItem, getItemById } from '../../../js/modules/data';
 import { PartialRawMessage, RawMessage } from '../types/RawMessage';
 import { ContentMessage } from '../messages/outgoing';
 import { PubKey } from '../types';
@@ -107,28 +104,17 @@ export class PendingMessageCache {
       return [];
     }
 
-    const barePending = JSON.parse(String(data.value)) as Array<PartialRawMessage>;
+    const barePending = JSON.parse(String(data.value)) as Array<
+      PartialRawMessage
+    >;
 
     // Rebuild plainTextBuffer
-    // tslint:disable-next-line: no-unnecessary-local-variable
-    const pending = barePending.map((message: PartialRawMessage) => {
-      const rebuiltMessage = { ...message };
-
-      // From Array<number> to ArrayBuffer
-      const bufferArray = Uint8Array.from(message.plainTextBuffer);
-
-      // From ArrayBuffer into Buffer
-      const buffer = Buffer.alloc(bufferArray.byteLength);
-      for (let i = 0; i < buffer.length; i++) {
-        buffer[i] = bufferArray[i];
-      }
-
-      rebuiltMessage.plainTextBuffer = buffer;
-
-      return rebuiltMessage as RawMessage;
+    return barePending.map((message: PartialRawMessage) => {
+      return {
+        ...message,
+        plainTextBuffer: new Uint8Array(message.plainTextBuffer),
+      } as RawMessage;
     });
-
-    return pending;
   }
 
   private async saveToDB() {