From ae67f424a3c6a543aea42bfe0ffa98985707c454 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 18 Jun 2020 15:04:48 +1000 Subject: [PATCH] move instance of MessageQueue export to ts/session folder --- preload.js | 1 - ts/session/index.ts | 3 ++- ts/session/{sending => }/instance.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename ts/session/{sending => }/instance.ts (79%) diff --git a/preload.js b/preload.js index 2db234a1d..feb420f9a 100644 --- a/preload.js +++ b/preload.js @@ -160,7 +160,6 @@ window.setPassword = (passPhrase, oldPhrase) => window.passwordUtil = require('./app/password_util'); window.libsession = require('./ts/session'); -window.libsession.getMessageQueue = require('./ts/session/sending/instance').getMessageQueue; // We never do these in our code, so we'll prevent it everywhere window.open = () => null; diff --git a/ts/session/index.ts b/ts/session/index.ts index bf8312146..c7028c098 100644 --- a/ts/session/index.ts +++ b/ts/session/index.ts @@ -1,5 +1,6 @@ import * as Messages from './messages'; import * as Protocols from './protocols'; import * as Types from './types'; +import { getMessageQueue } from './instance'; -export { Messages, Protocols, Types }; +export { Messages, Protocols, Types, getMessageQueue }; diff --git a/ts/session/sending/instance.ts b/ts/session/instance.ts similarity index 79% rename from ts/session/sending/instance.ts rename to ts/session/instance.ts index 13e794bb2..385ead7c8 100644 --- a/ts/session/sending/instance.ts +++ b/ts/session/instance.ts @@ -1,4 +1,4 @@ -import { MessageQueue } from './MessageQueue'; +import { MessageQueue } from './sending/'; let messageQueue: MessageQueue;