From 6a400a276a58d1692a59f9102205c341fcd32373 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Thu, 20 Oct 2016 00:21:36 +0800
Subject: [PATCH] #52 add chinese friend confirm message

---
 src/puppet-web/firer.spec.ts | 20 ++++++++++++++++----
 src/puppet-web/firer.ts      |  8 +++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/puppet-web/firer.spec.ts b/src/puppet-web/firer.spec.ts
index ee968783..2a5b7810 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 cd9979b9..72591b20 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<void> {
   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
-- 
GitLab