From 651f660fa4292a913f2e0b2d46b499688747489a Mon Sep 17 00:00:00 2001 From: Bjornskjald Date: Fri, 31 May 2019 19:39:36 +0200 Subject: [PATCH] Cleaned up imports --- src/Client.ts | 3 +-- src/index.ts | 3 +-- src/mqtt/payloads/ReadReceiptPayload.ts | 2 +- src/types/Message.ts | 2 +- src/types/events/parseDeltaEvent.ts | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Client.ts b/src/Client.ts index 0dea33d..7aa030c 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -9,8 +9,7 @@ import User, { parseUser } from './types/User' import debug from 'debug' import { Readable } from 'stream' import { PublishPacket } from './mqtt/messages/Publish' -import Message, { MessageOptions, parseThreadMessage } from './types/Message' -import parseDeltaMessage from './types/message/parseDeltaMessage' +import Message, { MessageOptions, parseThreadMessage, parseDeltaMessage } from './types/Message' import parseDeltaEvent from './types/events/parseDeltaEvent' import EventEmitter from 'events' import { AttachmentNotFoundError, AttachmentURLMissingError } from './types/Errors' diff --git a/src/index.ts b/src/index.ts index 632ac9f..392923d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,11 +1,10 @@ +export { default as Message, MessageOptions, Mention } from './types/Message' export { default as Client, ClientOptions } from './Client' export { default as Attachment } from './types/Attachment' export { default as AuthTokens } from './types/AuthTokens' export { default as DeviceId } from './types/DeviceId' -export { default as Message } from './types/Message' export { default as Session } from './types/Session' export { default as Thread } from './types/Thread' export { default as User } from './types/User' export * from './types/Attachment' export * from './types/Events' -export * from './types/Message' diff --git a/src/mqtt/payloads/ReadReceiptPayload.ts b/src/mqtt/payloads/ReadReceiptPayload.ts index 89085ad..e9c8fb7 100644 --- a/src/mqtt/payloads/ReadReceiptPayload.ts +++ b/src/mqtt/payloads/ReadReceiptPayload.ts @@ -1,6 +1,6 @@ import Payload from './Payload' import { Thrift, TCompactProtocol, Int64 } from 'thrift' -import Message from '../../types/message' +import Message from '../../types/Message' import RandomIntGenerator from '../../RandomIntGenerator' import Long from 'long' diff --git a/src/types/Message.ts b/src/types/Message.ts index f3ed7a4..a9b8064 100644 --- a/src/types/Message.ts +++ b/src/types/Message.ts @@ -18,5 +18,5 @@ export interface Mention { export interface MessageOptions { mentions?: Mention[] } -export { default as parseDeltaMessage } from './message/parseDeltaMessage' +export { default as parseDeltaMessage, getThreadId } from './message/parseDeltaMessage' export { default as parseThreadMessage } from './message/parseThreadMessage' diff --git a/src/types/events/parseDeltaEvent.ts b/src/types/events/parseDeltaEvent.ts index 2c3444f..d69f6c5 100644 --- a/src/types/events/parseDeltaEvent.ts +++ b/src/types/events/parseDeltaEvent.ts @@ -10,7 +10,7 @@ import { EventType } from '../Events' import parseAdminMessage from './parseAdminMessage' -import { getThreadId } from '../message/parseDeltaMessage' +import { getThreadId } from '../Message' export default function parseDeltaEvent (event: any): { type: EventType, event: Event } { if (event.deltaAdminTextMessage) return parseAdminMessage(event.deltaAdminTextMessage)