Cleaned up imports

Author: Bjornskjald

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'

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'

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'
 

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'

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)