提交 85372df8 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

Merge branch 'master' of github.com:zixia/wechaty

......@@ -48,5 +48,5 @@ coverage
# Other staff
0
t.js
t
t/
.DS_Store
......@@ -470,7 +470,7 @@ Know more about TAP: [Why I use Tape Instead of Mocha & So Should You](https://m
# Version History
## v0.3.2 (master)
## v0.3.9 (master)
1. Managed by Cloud Manager: https://app.wechaty.io
1. Dockerized & Published to docker hub as: [zixia/wechaty](https://hub.docker.com/r/zixia/wechaty/)
1. add `reset` & `shutdown` to IO Event
......@@ -611,3 +611,5 @@ Copyright & License
[dependency-url]: https://david-dm.org/zixia/wechaty
[dev-dependency-image]: https://img.shields.io/david/dev/zixia/wechaty.svg
[dev-dependency-url]: https://david-dm.org/zixia/wechaty#info=devDependencies
{
"name": "wechaty",
"version": "0.3.8",
"version": "0.3.9",
"description": "Wechat for Bot (Personal Account)",
"main": "index.js",
"scripts": {
......@@ -47,12 +47,12 @@
},
"dependencies": {
"body-parser": "^1.15.2",
"chromedriver": "^2.22.2",
"chromedriver": "^2.23.0",
"co": "^4.6.0",
"eventemitter2": "^2.1.0",
"express": "^4.13.4",
"npmlog": "^4.0.0",
"phantomjs-prebuilt": "^2.1.10",
"phantomjs-prebuilt": "^2.1.12",
"ps-tree": "^1.0.1",
"retry-promise": "^1.0.0",
"selenium-webdriver": "^3.0.0-beta-1",
......@@ -63,7 +63,7 @@
"apiai": "^2.0.1",
"cookie-parser": "^1.4.3",
"cross-env": "^2.0.0",
"eslint": "^3.2.2",
"eslint": "^3.3.0",
"qrcode-terminal": "^0.10.0",
"tape": "^4.6.0",
"tuling123-client": "0.0.1"
......
......@@ -55,7 +55,7 @@ class Message {
return Util.plainText(this.obj.content)
}
toStringDigest() {
const text = webUtil.digestEmoji(this.obj.digest)
const text = Util.digestEmoji(this.obj.digest)
return '{' + this.typeEx() + '}' + text
}
......
......@@ -61,7 +61,7 @@ function downloadStream(url, cookies) {
// 'pgv_pvi=6639183872; pgv_si=s8359147520; webwxuvid=747895d9dac5a25dd3a78175a5e931d879e026cacaf3ac06de0bd5f071470e7182fa36f7f1f0477ae5ee9266f741999a; mm_lang=zh_CN; MM_WX_NOTIFY_STATE=1; MM_WX_SOUND_STATE=1; wxloadtime=1465928826_expired; wxpluginkey=1465901102; wxuin=1211516682; wxsid=zMT7Gb24aTQzB1rA; webwx_data_ticket=gSeBbuhX+0kFdkXbgeQwr6Ck'
options.headers.Cookie = cookies.map(c => `${c.name}=${c.value}`).join('; ')
// log.verbose('WebUtil', 'Cookie: %s', options.headers.Cookie)
// log.verbose('Util', 'Cookie: %s', options.headers.Cookie)
return new Promise((resolve, reject) => {
const req = http.request(options, (res) => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册