move contact/message/friendship/etc to src/user/ folder

src/index.ts

@@ -20,16 +20,13 @@ import {
 
 export {
   Contact,
-}                         from './contact'
-export {
   Friendship,
-}                         from './friendship'
-export {
+  Favorite,
   Message,
-}                         from './message'
-export {
+  Moment,
+  Money,
   Room,
-}                         from './room'
+}                         from './user'
 
 export {
   MediaMessage,

src/io-client.ts

@@ -24,7 +24,7 @@ import express from 'express'
 // import Brolog       from 'brolog'
 import StateSwitch  from 'state-switch'
 
-import { Message }      from './message'
+import { Message }      from './user'
 
 import {
   config,

src/io.ts

@@ -21,7 +21,7 @@ import { StateSwitch }  from 'state-switch'
 
 import {
   Message,
-}                 from './message'
+}                 from './user'
 
 import {
   PuppetScanEvent,

src/puppet-puppeteer/puppet-puppeteer.ts

@@ -93,16 +93,6 @@ import {
   PuppetScanEvent,
 }                           from '../puppet/'
 
-import {
-  // Contact,
-}                             from '../contact'
-import {
-  // Messageirection,
-}                             from '../message'
-import {
-  // Room,
-}                             from '../room'
-
 export type PuppetFoodType = 'scan' | 'ding'
 export type ScanFoodType   = 'scan' | 'login' | 'logout'
 

src/puppet-puppeteer/puppeteer-contact.spec.ts

@@ -35,7 +35,7 @@ import {
 
 // import Wechaty from '../wechaty'
 
-import Contact from '../contact'
+import { Contact } from '../user'
 
 import PuppetPuppeteer  from './puppet-puppeteer'
 

src/puppet-puppeteer/puppeteer-friendship.spec.ts

@@ -28,7 +28,7 @@ import {
 
 import {
   Contact,
-}           from '../contact'
+}           from '../user'
 import {
   Wechaty,
 }           from '../wechaty'

src/puppet-puppeteer/puppeteer-message.spec.ts

@@ -38,7 +38,7 @@ import {
 
 import {
   Message,
- }                  from '../message'
+ }                  from '../user'
 
 import {
   PuppetPuppeteer,

src/contact.spec.ts → src/user/contact.accessory.spec.ts

@@ -14,7 +14,7 @@ import {
 }                           from './contact'
 import {
   PuppetMock,
-}                           from './puppet-mock'
+}                           from '../puppet-mock'
 
 // tslint:disable-next-line:variable-name
 const Contact = cloneClass(GlobalContact)

src/contact.ts → src/user/contact.ts

@@ -24,10 +24,10 @@ import {
   log,
   Raven,
   Sayable,
-}             from './config'
+}             from '../config'
 import {
   Accessory,
-}             from './accessory'
+}             from '../accessory'
 
 // import Message          from './message'
 
@@ -36,7 +36,7 @@ import {
   ContactPayload,
   ContactQueryFilter,
   ContactType,
-}                         from './puppet/'
+}                         from '../puppet/'
 
 export const POOL = Symbol('pool')
 

src/user/favorite.ts

+export class Favorite {
+
+  public static list(): Favorite[] {
+    return []
+  }
+
+  constructor() {
+    //
+  }
+
+  public tag() {
+    //
+  }
+
+}
+
+export default Favorite

src/friendship.ts → src/user/friendship.ts

@@ -26,21 +26,22 @@ import {
 
 import {
   Accessory,
-}                   from './accessory'
-import {
-  Contact,
-}                   from './contact'
+}                   from '../accessory'
 import {
   log,
-}                   from './config'
+}                   from '../config'
 import {
   Misc,
-}                   from './misc'
+}                   from '../misc'
 
 import {
   FriendshipPayload,
   FriendshipType,
-}                         from './puppet/'
+}                         from '../puppet/'
+
+import {
+  Contact,
+}                   from './contact'
 
 /**
  * Send, receive friend request, and friend confirmation events.

src/user/index.ts

+export * from './contact'
+export * from './favorite'
+export * from './friendship'
+export * from './message'
+export * from './moment'
+export * from './money'
+export * from './room'

src/message.ts → src/user/message.ts

@@ -29,10 +29,10 @@ import {
 import {
   log,
   Sayable,
-}                 from './config'
+}                 from '../config'
 import {
   Accessory,
-}                 from './accessory'
+}                 from '../accessory'
 
 import {
   Contact,
@@ -44,7 +44,7 @@ import {
 import {
   MessagePayload,
   MessageType,
-}                 from './puppet/'
+}                 from '../puppet/'
 
 /**
  * All wechat messages will be encapsulated as a Message.
@@ -254,6 +254,14 @@ export class Message extends Accessory implements Sayable {
     return room
   }
 
+  /**
+   * @deprecated use text() instead
+   */
+  public content(): string {
+    log.warn('Message', 'content() DEPRECATED. use text() instead.')
+    return this.text()
+  }
+
   /**
    * Get the text content of the message
    *

src/user/moment.ts

+import { Contact } from './contact'
+
+export class Moment {
+  public static post() {
+    // post new moment
+  }
+
+  public static timeline(contact: Contact): Moment[] {
+    // list all moment
+    if (contact) {
+      //
+    }
+    return []
+  }
+
+  constructor() {
+    //
+  }
+}

src/user/money.ts

+export class Money {
+  constructor() {
+    //
+  }
+}
+
+export default Money

src/room.ts → src/user/room.ts

@@ -31,15 +31,14 @@ import {
   Raven,
   Sayable,
   log,
-}                       from './config'
+}                       from '../config'
 import {
   Accessory,
-}               from './accessory'
+}               from '../accessory'
 
 import {
   Contact,
 }               from './contact'
-// import Message          from './message'
 
 export const ROOM_EVENT_DICT = {
   join: 'tbw',
@@ -52,7 +51,7 @@ import {
   RoomMemberQueryFilter,
   RoomPayload,
   RoomQueryFilter,
-}                         from './puppet/'
+}                         from '../puppet/'
 
 /**
  * All wechat rooms(groups) will be encapsulated as a Room.

src/wechaty.ts

@@ -63,16 +63,10 @@ import {
 import {
   Contact,
   ContactSelf,
-}                       from './contact'
-import {
   Friendship,
-}                       from './friendship'
-import {
   Message,
-}                       from './message'
-import {
   Room,
-}                       from './room'
+}                       from './user/'
 
 import {
   CHAT_EVENT_DICT,