Skip to content

Commit

Permalink
#52 add chinese friend confirm message
Browse files Browse the repository at this point in the history
  • Loading branch information
huan committed Oct 19, 2016
1 parent 3ba3313 commit 6a400a2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
20 changes: 16 additions & 4 deletions src/puppet-web/firer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 3 additions & 5 deletions src/puppet-web/firer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -52,6 +52,7 @@ const PuppetWebFirer = {
const regexConfig = {
friendConfirm: [
/^You have added (.+) as your WeChat contact. Start chatting!$/
, /^你已添加了(.+),现在可以开始聊天了。$/
]

, roomJoin: [
Expand Down Expand Up @@ -316,7 +317,7 @@ function checkRoomTopic(content: string): [string, string] {
return [topic, changer]
}

async function fireRoomTopic(m: Message) {
async function fireRoomTopic(m: Message): Promise<void> {
let topic, changer
try {
[topic, changer] = checkRoomTopic(m.content())
Expand Down Expand Up @@ -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

0 comments on commit 6a400a2

Please sign in to comment.