From 2546084f6174d214564741a9ecbef87c2ecae948 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Wed, 5 Oct 2016 04:46:00 +0800
Subject: [PATCH] bug fix

---
 src/puppet-web/event.js | 8 ++++----
 src/room.js             | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/puppet-web/event.js b/src/puppet-web/event.js
index 0a59849d..779c3ecc 100644
--- a/src/puppet-web/event.js
+++ b/src/puppet-web/event.js
@@ -422,7 +422,7 @@ function fireRoomJoin(m) {
   const room    = m.room()
   const content = m.content()
 
-  const inviteRe = /^(.+) invited "(.+)" to the group chat$/
+  const inviteRe = /^"?(.+)"? invited "(.+)" to the group chat$/
 
   const found = content.match(inviteRe)
   if (!found) {
@@ -435,10 +435,10 @@ function fireRoomJoin(m) {
   if (inviter === "You've") {
     inviterContact = Contact.load(this.userId)
   } else {
-    inviterContact = m.member(inviter)
+    inviterContact = room.member(inviter)
   }
 
-  inviteeContact = m.room().member(invitee)
+  inviteeContact = room.member(invitee)
 
   if (!inviterContact || !inviteeContact) {
     log.error('PuppetWebEvent', 'inivter or invitee not found for %s, %s', inviter, invitee)
@@ -465,7 +465,7 @@ function fireRoomLeave(m) {
   leaverContact = m.room().member(leaver)
 
   if (!leaverContact) {
-    log.err('PuppetWebEvent', 'leaver not found for %s', leaver)
+    log.error('PuppetWebEvent', 'leaver not found for %s', leaver)
     return
   }
   room.emit('leave', leaverContact)
diff --git a/src/room.js b/src/room.js
index 922da466..1dddfbf4 100644
--- a/src/room.js
+++ b/src/room.js
@@ -11,6 +11,7 @@
 const EventEmitter = require('events')
 
 const Wechaty   = require('./wechaty')
+const Contact   = require('./contact')
 const log       = require('./brolog-env')
 const UtilLib   = require('./util-lib')
 const Config    = require('./config')
-- 
GitLab