diff --git a/src/puppet-web/firer.spec.ts b/src/puppet-web/firer.spec.ts index ee968783e384bac7db911468453246e2c04e06c3..2a5b781044926a020b85d5fe56d1d42ab3001211 100644 --- a/src/puppet-web/firer.spec.ts +++ b/src/puppet-web/firer.spec.ts @@ -20,11 +20,23 @@ test('Firer smoking test', t => { }) test('Firer.checkFriendConfirm', t => { - const content = 'You have added 李卓桓 as your WeChat contact. Start chatting!' - let result + const contentList = [ + [ + 'You have added 李卓桓 as your WeChat contact. Start chatting!' + , '李卓桓' + ] + , [ + '你已添加了李卓桓,现在可以开始聊天了。' + , '李卓桓' + ] + + ] + let result: boolean - result = Firer.checkFriendConfirm(content) - t.truthy(result, 'should be truthy for confirm msg') + contentList.forEach((content, friend) => { + result = Firer.checkFriendConfirm(content) + t.truthy(result, 'should be truthy for confirm msg: ' + content) + }) result = Firer.checkFriendConfirm('fsdfsdfasdfasdfadsa') t.falsy(result, 'should be falsy for other msg') diff --git a/src/puppet-web/firer.ts b/src/puppet-web/firer.ts index cd9979b9a2625825d51968fea8b480211ae2dd6c..72591b204d47ad76248ec5d60a41b61fed5a4a12 100644 --- a/src/puppet-web/firer.ts +++ b/src/puppet-web/firer.ts @@ -31,7 +31,7 @@ import log from '../brolog-env' import FriendRequest from './friend-request' /* tslint:disable:variable-name */ -const PuppetWebFirer = { +export const PuppetWebFirer = { fireFriendConfirm , fireFriendRequest @@ -52,6 +52,7 @@ const PuppetWebFirer = { const regexConfig = { friendConfirm: [ /^You have added (.+) as your WeChat contact. Start chatting!$/ + , /^你已添加了(.+),现在可以开始聊天了。$/ ] , roomJoin: [ @@ -316,7 +317,7 @@ function checkRoomTopic(content: string): [string, string] { return [topic, changer] } -async function fireRoomTopic(m: Message) { +async function fireRoomTopic(m: Message): Promise { let topic, changer try { [topic, changer] = checkRoomTopic(m.content()) @@ -344,18 +345,15 @@ async function fireRoomTopic(m: Message) { return } - // co.call(this, function* () { try { await changerContact.ready() await room.ready() this.emit('room-topic', room, topic, oldTopic, changerContact) room.emit('topic' , topic, oldTopic, changerContact) room.refresh() - // }).catch(e => { } catch (e) { log.error('PuppetWebFirer', 'fireRoomTopic() co exception: %s', e.stack) } } -// module.exports = PuppetWebFirer export default PuppetWebFirer