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

#52 add chinese friend confirm message

上级 3ba33137
...@@ -20,11 +20,23 @@ test('Firer smoking test', t => { ...@@ -20,11 +20,23 @@ test('Firer smoking test', t => {
}) })
test('Firer.checkFriendConfirm', t => { test('Firer.checkFriendConfirm', t => {
const content = 'You have added 李卓桓 as your WeChat contact. Start chatting!' const contentList = [
let result [
'You have added 李卓桓 as your WeChat contact. Start chatting!'
, '李卓桓'
]
, [
'你已添加了李卓桓,现在可以开始聊天了。'
, '李卓桓'
]
]
let result: boolean
result = Firer.checkFriendConfirm(content) contentList.forEach((content, friend) => {
t.truthy(result, 'should be truthy for confirm msg') result = Firer.checkFriendConfirm(content)
t.truthy(result, 'should be truthy for confirm msg: ' + content)
})
result = Firer.checkFriendConfirm('fsdfsdfasdfasdfadsa') result = Firer.checkFriendConfirm('fsdfsdfasdfasdfadsa')
t.falsy(result, 'should be falsy for other msg') t.falsy(result, 'should be falsy for other msg')
......
...@@ -31,7 +31,7 @@ import log from '../brolog-env' ...@@ -31,7 +31,7 @@ import log from '../brolog-env'
import FriendRequest from './friend-request' import FriendRequest from './friend-request'
/* tslint:disable:variable-name */ /* tslint:disable:variable-name */
const PuppetWebFirer = { export const PuppetWebFirer = {
fireFriendConfirm fireFriendConfirm
, fireFriendRequest , fireFriendRequest
...@@ -52,6 +52,7 @@ const PuppetWebFirer = { ...@@ -52,6 +52,7 @@ const PuppetWebFirer = {
const regexConfig = { const regexConfig = {
friendConfirm: [ friendConfirm: [
/^You have added (.+) as your WeChat contact. Start chatting!$/ /^You have added (.+) as your WeChat contact. Start chatting!$/
, /^你已添加了(.+),现在可以开始聊天了。$/
] ]
, roomJoin: [ , roomJoin: [
...@@ -316,7 +317,7 @@ function checkRoomTopic(content: string): [string, string] { ...@@ -316,7 +317,7 @@ function checkRoomTopic(content: string): [string, string] {
return [topic, changer] return [topic, changer]
} }
async function fireRoomTopic(m: Message) { async function fireRoomTopic(m: Message): Promise<void> {
let topic, changer let topic, changer
try { try {
[topic, changer] = checkRoomTopic(m.content()) [topic, changer] = checkRoomTopic(m.content())
...@@ -344,18 +345,15 @@ async function fireRoomTopic(m: Message) { ...@@ -344,18 +345,15 @@ async function fireRoomTopic(m: Message) {
return return
} }
// co.call(this, function* () {
try { try {
await changerContact.ready() await changerContact.ready()
await room.ready() await room.ready()
this.emit('room-topic', room, topic, oldTopic, changerContact) this.emit('room-topic', room, topic, oldTopic, changerContact)
room.emit('topic' , topic, oldTopic, changerContact) room.emit('topic' , topic, oldTopic, changerContact)
room.refresh() room.refresh()
// }).catch(e => {
} catch (e) { } catch (e) {
log.error('PuppetWebFirer', 'fireRoomTopic() co exception: %s', e.stack) log.error('PuppetWebFirer', 'fireRoomTopic() co exception: %s', e.stack)
} }
} }
// module.exports = PuppetWebFirer
export default PuppetWebFirer export default PuppetWebFirer
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册