From f0ba4fa276f60b143cfa726c50b82ec14dc5370d Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 9 Jun 2020 09:55:27 +1000 Subject: [PATCH] partial raw messages --- ts/session/sending/PendingMessageCache.ts | 6 +++--- ts/session/types/RawMessage.ts | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts index 1fd9574b7..43c84cd4a 100644 --- a/ts/session/sending/PendingMessageCache.ts +++ b/ts/session/sending/PendingMessageCache.ts @@ -2,7 +2,7 @@ import { createOrUpdateItem, getItemById, } from '../../../js/modules/data'; -import { BareRawMessage, RawMessage } from '../types/RawMessage'; +import { PartialRawMessage, RawMessage } from '../types/RawMessage'; import { ContentMessage } from '../messages/outgoing'; import { PubKey } from '../types'; import * as MessageUtils from '../utils'; @@ -107,11 +107,11 @@ export class PendingMessageCache { return []; } - const barePending = JSON.parse(String(data.value)) as Array; + const barePending = JSON.parse(String(data.value)) as Array; // Rebuild plainTextBuffer // tslint:disable-next-line: no-unnecessary-local-variable - const pending = barePending.map((message: BareRawMessage) => { + const pending = barePending.map((message: PartialRawMessage) => { const rebuiltMessage = { ...message }; // From Array to ArrayBuffer diff --git a/ts/session/types/RawMessage.ts b/ts/session/types/RawMessage.ts index 490dbf041..a0333c603 100644 --- a/ts/session/types/RawMessage.ts +++ b/ts/session/types/RawMessage.ts @@ -11,7 +11,8 @@ export interface RawMessage { encryption: EncryptionType; } -export interface BareRawMessage { +// For building RawMessages from JSON +export interface PartialRawMessage { identifier: string; plainTextBuffer: any; timestamp: number;