abstract puppet passed the linting! (#1166)

examples/api-ai-bot.ts

@@ -43,7 +43,7 @@ import { EventEmitter } from 'events'
 import {
   config,
   Wechaty,
-}           from '../'
+}           from '../src/'
 
 // log.level = 'verbose'
 // log.level = 'silly'

examples/blessed-twins-bot/index.ts

@@ -9,7 +9,7 @@ import * as qrcode from 'qrcode-terminal'
 
 import {
   Wechaty,
-}               from '../../index'
+}               from '../../src/'
 
 const screen = blessed.screen({
   smartCSR:     true,

examples/contact-bot.ts

@@ -32,7 +32,7 @@ import {
   // Contact,
   Wechaty,
   log,
-}           from '../'
+}           from '../src/'
 
 const welcome = `
 =============== Powered by Wechaty ===============
@@ -103,16 +103,16 @@ async function onLogin() {
     }
   }
 
-  /**
-   *  Special contact list
-   */
+  // /**
+  //  *  Special contact list
+  //  */
 
-  for (let i = 0; i < contactList.length; i++) {
-    const contact = contactList[i]
-    if (contact.special()) {
-      log.info('Bot', `special ${i}: ${contact.name()}`)
-    }
-  }
+  // for (let i = 0; i < contactList.length; i++) {
+  //   const contact = contactList[i]
+  //   if (contact.special()) {
+  //     log.info('Bot', `special ${i}: ${contact.name()}`)
+  //   }
+  // }
 
   /**
    *  personal contact list
@@ -121,7 +121,7 @@ async function onLogin() {
   for (let i = 0; i < contactList.length; i++) {
     const contact = contactList[i]
     if (contact.personal()) {
-      log.info('Bot', `personal ${i}: ${contact.get('name')} : ${contact.id}`)
+      log.info('Bot', `personal ${i}: ${contact.name()} : ${contact.id}`)
     }
   }
 

examples/ding-dong-bot.ts

@@ -31,7 +31,7 @@ import {
   config,
   Wechaty,
   log,
-}               from '../src/index'
+}               from '../src/'
 
 const BOT_QR_CODE_IMAGE_FILE = path.join(
   __dirname,

examples/friend-bot.ts

@@ -30,7 +30,7 @@ import {
   // Contact,
   log,
   Wechaty,
-}           from '../'
+}           from '../src/'
 
 const welcome = `
 =============== Powered by Wechaty ===============
@@ -80,7 +80,7 @@ bot
   const fileHelper = bot.Contact.load('filehelper')
 
   try {
-    logMsg = 'received `friend` event from ' + contact.get('name')
+    logMsg = 'received `friend` event from ' + contact.name()
     fileHelper.say(logMsg)
     console.log(logMsg)
 
@@ -105,7 +105,7 @@ bot
        * 2. Friend Ship Confirmed
        *
        */
-      logMsg = 'friend ship confirmed with ' + contact.get('name')
+      logMsg = 'friend ship confirmed with ' + contact.name()
     }
   } catch (e) {
     logMsg = e.message

examples/gist-bot/index.ts

@@ -26,7 +26,7 @@ import {
   config,
   Wechaty,
   log,
-}           from '../../'
+}           from '../../src/'
 
 import { onMessage }  from './on-message'
 import { onFriend }   from './on-friend'

examples/gist-bot/on-friend.ts

@@ -27,7 +27,7 @@ import {
   FriendRequest,
   Wechaty,
   // Room,
-}                 from '../../'
+}                 from '../../src/'
 
 export async function onFriend(this: Wechaty, contact: Contact, request?: FriendRequest): Promise<void> {
   try {

examples/gist-bot/on-message.ts

@@ -25,7 +25,7 @@
 import {
   Message,
   Wechaty,
-} from '../../'
+} from '../../src/'
 
 export async function onMessage(this: Wechaty, message: Message): Promise<void> {
   try {
@@ -35,7 +35,7 @@ export async function onMessage(this: Wechaty, message: Message): Promise<void>
 
     console.log((room ? '[' + room.topic() + ']' : '')
                 + '<' + sender.name() + '>'
-                + ':' + message.toStringDigest(),
+                + ':' + message,
     )
 
     if (message.self() || room) {

examples/gist-bot/on-room-join.ts

@@ -25,11 +25,11 @@
 import {
   Contact,
   Room,
-  Sayable,
-}           from '../../'
+  Wechaty,
+}           from '../../src/'
 
 export async function onRoomJoin(
-  this: Sayable,
+  this: Wechaty,
   room: Room,
   inviteeList: Contact[],
   inviter: Contact,

examples/media-file-bot.ts

@@ -34,10 +34,11 @@ import * as qrcodeTerminal  from 'qrcode-terminal'
  */
 import {
   config,
-  MediaMessage,
+  Message,
   // MsgType,
   Wechaty,
-}           from '../'
+}           from '../src/'
+
 const bot = Wechaty.instance({ profile: config.default.DEFAULT_PROFILE })
 
 bot
@@ -63,15 +64,15 @@ bot
   //   || m.type() === MsgType.APP
   //   || (m.type() === MsgType.TEXT && m.typeSub() === MsgType.LOCATION)  // LOCATION
   // ) {
-  if (m instanceof MediaMessage) {
+  if (m.type() !== Message.Type.TEXT) {
     saveMediaFile(m)
   }
   // }
 })
 .start()
 .catch(e => console.error('bot.start() error: ' + e))
 
-async function saveMediaFile(message: MediaMessage) {
+async function saveMediaFile(message: Message) {
   const filename = message.filename()
   console.log('IMAGE local filename: ' + filename)
 

examples/roger-bot.ts

@@ -25,7 +25,7 @@ const qrcodeTerminal = require('qrcode-terminal')
  * to     `import { ... } from 'wechaty'`
  * when you are runing with Docker or NPM instead of Git Source.
  */
-import { Wechaty } from '../'
+import { Wechaty } from '../src/'
 
 const bot = Wechaty.instance(/* no profile here because roger bot is too noisy */)
 

examples/room-bot.ts

@@ -58,7 +58,7 @@ import {
   Room,
   Wechaty,
   log,
-}             from '../'
+}             from '../src/'
 
 const welcome = `
 =============== Powered by Wechaty ===============
@@ -164,7 +164,7 @@ bot
 
   console.log((room ? '[' + room.topic() + ']' : '')
               + '<' + sender.name() + '>'
-              + ':' + message.toStringDigest(),
+              + ':' + message,
   )
 
   if (message.self()) {

examples/speech-to-text-bot.ts

@@ -37,10 +37,9 @@ const qrcodeTerminal = require('qrcode-terminal')
  */
 import {
   config,
-  MediaMessage,
-  MsgType,
+  Message,
   Wechaty,
-}                 from '../'
+}                 from '../src/'
 
 const bot = Wechaty.instance({ profile: config.default.DEFAULT_PROFILE })
 
@@ -56,11 +55,11 @@ bot
 .on('message', async function(this, msg) {
   console.log(`RECV: ${msg}`)
 
-  if (msg.type() !== MsgType.VOICE) {
+  if (msg.type() !== Message.Type.VOICE) {
     return // skip no-VOICE message
   }
 
-  const mp3Stream = await (msg as MediaMessage).readyStream()
+  const mp3Stream = await msg.readyStream()
 
   const file = createWriteStream(msg.filename())
   mp3Stream.pipe(file)

examples/tuling123-bot.ts

@@ -39,7 +39,7 @@ import {
   config,
   Wechaty,
   log,
-}           from '../'
+}           from '../src/'
 
 // log.level = 'verbose'
 // log.level = 'silly'

package.json

@@ -163,7 +163,7 @@
     "tslint-eslint-rules": "^5.1.0",
     "tslint-jsdoc-rules": "^0.1.0",
     "tuling123-client": "^0.0.1",
-    "typescript": "^2.6.1"
+    "typescript": "^2.8.3"
   },
   "files_comment__whitelist_npm_publish": "http://stackoverflow.com/a/8617868/1123955",
   "files": [

src/io-client.ts

@@ -148,7 +148,7 @@ export class IoClient {
     //               , m.toStringDigest()
     //         )
 
-    if (/^wechaty|chatie|botie/i.test(m.content()) && !m.self()) {
+    if (/^wechaty|chatie|botie/i.test(m.text()) && !m.self()) {
       m.say('https://www.chatie.io')
         .then(_ => log.info('Bot', 'REPLIED to magic word "chatie"'))
     }

src/io.ts

@@ -286,7 +286,10 @@ export class Io {
         if (user) {
           const loginEvent: IoEvent = {
             name    : 'login',
-            payload : user.obj,
+            payload : {
+              id: user.id,
+              name: user.name(),
+            },
           }
           this.send(loginEvent)
         }

src/misc.ts

@@ -25,7 +25,6 @@ import {
 import * as url     from 'url'
 
 import { log }      from './config'
-import { MsgType }  from './message'
 
 export class Misc {
   public static stripHtml(html?: string): string {
@@ -249,22 +248,6 @@ export class Misc {
     return md5sum.digest('hex')
   }
 
-  public static msgType(ext: string): MsgType {
-    switch (ext) {
-      case 'bmp':
-      case 'jpeg':
-      case 'jpg':
-      case 'png':
-        return MsgType.IMAGE
-      case 'gif':
-        return MsgType.EMOTICON
-      case 'mp4':
-        return MsgType.VIDEO
-      default:
-        return MsgType.APP
-    }
-  }
-
   // public static mime(ext): string {
   //   switch (ext) {
   //     case 'pdf':

src/puppet-web/bridge.ts

@@ -37,10 +37,12 @@ const retryPromise  = require('retry-promise').default
 import { log }        from '../config'
 import Profile        from '../profile'
 import Misc           from '../misc'
+
 import {
   MediaData,
   MsgRawObj,
-}                     from './schema'
+}                           from './schema'
+import { WebContactRawObj } from './web-contact'
 
 export interface InjectResult {
   code:    number,
@@ -305,9 +307,9 @@ export class Bridge extends EventEmitter {
     }
   }
 
-  public async contactRemark(contactId: string, remark: string|null): Promise<boolean> {
+  public async contactAlias(contactId: string, alias: string|null): Promise<boolean> {
     try {
-      return await this.proxyWechaty('contactRemark', contactId, remark)
+      return await this.proxyWechaty('contactRemark', contactId, alias)
     } catch (e) {
       log.verbose('PuppetWebBridge', 'contactRemark() exception: %s', e.message)
       // Issue #509 return false instead of throw when contact is not a friend.
@@ -494,7 +496,7 @@ export class Bridge extends EventEmitter {
     }
   }
 
-  public async getContact(id: string): Promise<object> {
+  public async getContact(id: string): Promise<WebContactRawObj> {
     if (id !== id) { // NaN
       const err = new Error('NaN! where does it come from?')
       log.error('PuppetWebBridge', 'getContact(NaN): %s', err)

src/puppet-web/event.ts

@@ -223,14 +223,14 @@ async function onMessage(
       case MsgType.MICROVIDEO:
       case MsgType.APP:
         log.verbose('PuppetWebEvent', 'onMessage() EMOTICON/IMAGE/VIDEO/VOICE/MICROVIDEO message')
-        m = new MediaMessage(obj)
+        m = new WebMessage(obj)
         m.puppet = this
         break
 
       case MsgType.TEXT:
         if (m.typeSub() === MsgType.LOCATION) {
           log.verbose('PuppetWebEvent', 'onMessage() (TEXT&LOCATION) message')
-          m = new MediaMessage(obj)
+          m = new WebMessage(obj)
         }
         break
     }