file-box in residence (#1914)

docs/index.md

@@ -350,12 +350,12 @@ const contact = await bot.Contact.find()
 await bot.say(contact)
 
 // 3. send Image to bot itself from remote url
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 const fileBox = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
 await bot.say(fileBox)
 
 // 4. send Image to bot itself from local file
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 const fileBox = FileBox.fromFile('/tmp/text.jpg')
 await bot.say(fileBox)
 
@@ -473,7 +473,7 @@ await room.say('Hello world!')
 const msg = await room.say('Hello world!') // only supported by puppet-padplus
 
 // 2. Send media file inside Room
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 const fileBox1 = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
 const fileBox2 = FileBox.fromLocal('/tmp/text.txt')
 await room.say(fileBox1)
@@ -983,7 +983,7 @@ const msg = await contact.say('welcome to wechaty!') // only supported by puppet
 
 // 2. send media file to contact
 
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 const fileBox1 = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
 const fileBox2 = FileBox.fromFile('/tmp/text.txt')
 await contact.say(fileBox1)
@@ -1251,7 +1251,7 @@ bot.on('login', (user: ContactSelf) => {
 ```
 **Example** *(SET the avatar for a bot)*  
 ```js
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 bot.on('login', (user: ContactSelf) => {
   console.log(`user ${user} login`)
   const fileBox = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
@@ -1596,7 +1596,7 @@ This function is depending on the Puppet Implementation, see [puppet-compatible-
 
 **Example**  
 ```js
-import { FileBox }  from 'file-box'
+import { FileBox }  from 'wechaty'
 const bot = new Wechaty()
 bot
 .on('message', async m => {

examples/ding-dong-bot.ts

@@ -18,12 +18,12 @@
  */
 import {
   Contact,
+  FileBox,
   Message,
   ScanStatus,
   Wechaty,
 }               from '../src/' // from 'wechaty'
 
-import { FileBox }  from 'file-box'
 import { generate } from 'qrcode-terminal'
 
 /**

package.json

@@ -84,7 +84,6 @@
     "cuid": "^2.1.1",
     "hot-import": "^0.2.1",
     "in-gfw": "^1.2.0",
-    "memory-card": "^0.6.9",
     "npm-programmatic": "0.0.12",
     "open-graph": "^0.2.4",
     "opencollective": "^1.0.3",
@@ -96,7 +95,7 @@
     "read-pkg-up": "^7.0.0",
     "state-switch": "^0.6.2",
     "watchdog": "^0.8.1",
-    "wechaty-puppet": "^0.19.14",
+    "wechaty-puppet": "^0.19.17",
     "wechaty-puppet-hostie": "^0.3.13",
     "ws": "^7.0.0"
   },
@@ -142,7 +141,7 @@
     "sloc": "^0.2.0",
     "tstest": "^0.4.1",
     "typedoc": "^0.15.0",
-    "wechaty-puppet-mock": "^0.17.2"
+    "wechaty-puppet-mock": "^0.17.4"
   },
   "files_comment__whitelist_npm_publish": "http://stackoverflow.com/a/8617868/1123955",
   "files": [

src/config.ts

@@ -24,7 +24,11 @@ import Raven      from 'raven'
 import readPkgUp  from 'read-pkg-up'
 
 import { log }      from 'brolog'
-import { FileBox }  from 'file-box'
+
+import {
+  FileBox,
+  MemoryCard,
+}                   from 'wechaty-puppet'
 
 import {
   PuppetModuleName,
@@ -173,7 +177,10 @@ export function isProduction (): boolean {
 
 export {
   log,
+  FileBox,
+  MemoryCard,
   Raven,
+
   VERSION,
 }
 

src/index.ts

-export {
-  FileBox,
-}           from 'file-box'
-
 export {
   ScanStatus,
   UrlLinkPayload,
+  FileBox,
+  MemoryCard,
 }                 from 'wechaty-puppet'
 
 export {

src/user/contact-self.ts

@@ -17,9 +17,8 @@
  *
  *   @ignore
  */
-import { FileBox } from 'file-box'
-
 import {
+  FileBox,
   log,
 }           from '../config'
 
@@ -71,7 +70,7 @@ export class ContactSelf extends Contact {
    * })
    *
    * @example <caption>SET the avatar for a bot</caption>
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * bot.on('login', (user: ContactSelf) => {
    *   console.log(`user ${user} login`)
    *   const fileBox = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')

src/user/contact.ts

@@ -18,7 +18,6 @@
  *   @ignore
  */
 import { instanceToClass }  from 'clone-class'
-import { FileBox }          from 'file-box'
 
 import {
   ContactGender,
@@ -33,6 +32,8 @@ import {
 import {
   log,
   qrCodeForChatie,
+
+  FileBox,
   Raven,
 }                   from '../config'
 import {
@@ -344,7 +345,7 @@ export class Contact extends Accessory implements Sayable {
    *
    * // 2. send media file to contact
    *
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * const fileBox1 = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
    * const fileBox2 = FileBox.fromFile('/tmp/text.txt')
    * await contact.say(fileBox1)

src/user/image.ts

 import { instanceToClass } from 'clone-class'
-import { FileBox } from 'file-box'
 
 import { ImageType } from 'wechaty-puppet'
 
 import { Accessory } from '../accessory'
-import { log }        from '../config'
+import {
+  FileBox,
+  log,
+}                   from '../config'
 
 export class Image extends Accessory {
 

src/user/message.ts

@@ -19,9 +19,6 @@
 import {
   instanceToClass,
 }                       from 'clone-class'
-import {
-  FileBox,
-}                       from 'file-box'
 
 import {
   MessagePayload,
@@ -37,6 +34,8 @@ import {
 }                       from '../accessory'
 import {
   AT_SEPRATOR_REGEX,
+  FileBox,
+
   log,
   Raven,
 }                       from '../config'
@@ -445,7 +444,7 @@ export class Message extends Accessory implements Sayable {
    * @returns {Promise<void | Message>}
    *
    * @example
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * const bot = new Wechaty()
    * bot
    * .on('message', async m => {

src/user/room.ts

@@ -20,16 +20,14 @@
 import {
   instanceToClass,
 }                   from 'clone-class'
-import {
-  FileBox,
-}                   from 'file-box'
 
 import {
   Accessory,
 }                       from '../accessory'
 import {
-  // config,
   FOUR_PER_EM_SPACE,
+  FileBox,
+
   log,
   Raven,
 }                       from '../config'
@@ -410,7 +408,7 @@ export class Room extends Accessory implements Sayable {
    * const msg = await room.say('Hello world!') // only supported by puppet-padplus
    *
    * // 2. Send media file inside Room
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * const fileBox1 = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
    * const fileBox2 = FileBox.fromLocal('/tmp/text.txt')
    * await room.say(fileBox1)

src/wechaty.ts

@@ -25,16 +25,10 @@ import {
   cloneClass,
   // instanceToClass,
 }                   from 'clone-class'
-import {
-  FileBox,
-}                   from 'file-box'
 import {
   callerResolve,
   hotImport,
 }                   from 'hot-import'
-import {
-  MemoryCard,
-}                   from 'memory-card'
 import {
   StateSwitch,
 }                   from 'state-switch'
@@ -43,6 +37,9 @@ import {
   CHAT_EVENT_DICT,
   Puppet,
 
+  FileBox,
+  MemoryCard,
+
   PUPPET_EVENT_DICT,
   PuppetEventName,
   PuppetOptions,
@@ -1031,12 +1028,12 @@ export class Wechaty extends Accessory implements Sayable {
    * await bot.say(contact)
    *
    * // 3. send Image to bot itself from remote url
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * const fileBox = FileBox.fromUrl('https://chatie.io/wechaty/images/bot-qr-code.png')
    * await bot.say(fileBox)
    *
    * // 4. send Image to bot itself from local file
-   * import { FileBox }  from 'file-box'
+   * import { FileBox }  from 'wechaty'
    * const fileBox = FileBox.fromFile('/tmp/text.jpg')
    * await bot.say(fileBox)
    *