fix_function_room.member_#173

src/puppet-web/firer.ts

@@ -207,7 +207,7 @@ async function checkRoomJoin(m: Message): Promise<void> {
         const loaded = inviteeContactList[i] instanceof Contact
 
         if (!loaded) {
-          let c = room.member(inviteeList[i])
+          let c = room.member({remark: inviteeList[i]}) || room.member({nick: inviteeList[i]})
           if (!c) {
             inviteeListAllDone = false
             continue
@@ -234,7 +234,7 @@ async function checkRoomJoin(m: Message): Promise<void> {
       }
 
       if (!inviterContact) {
-        inviterContact = room.member(inviter)
+        inviterContact = room.member({remark: inviter}) || room.member({nick: inviter})
       }
 
       if (inviteeListAllDone && inviterContact) {
@@ -316,7 +316,7 @@ async function checkRoomLeave(m: Message): Promise<void> {
   /**
    * FIXME: leaver maybe is a list
    */
-  let leaverContact = room.member(leaver)
+  let leaverContact = room.member({remark: leaver}) || room.member({nick: leaver})
 
   if (!leaverContact) {
     log.error('PuppetWebFirer', 'fireRoomLeave() leaver %s not found, event `room-leave` & `leave` will not be fired')
@@ -354,7 +354,6 @@ async function checkRoomTopic(m: Message): Promise<void> {
   } catch (e) { // not found
     return
   }
-
   const room = m.room()
   if (!room) {
     log.warn('PuppetWebFirer', 'fireRoomLeave() room not found')
@@ -367,7 +366,7 @@ async function checkRoomTopic(m: Message): Promise<void> {
   if (/^You$/.test(changer) || /^你$/.test(changer)) {
     changerContact = Contact.load(this.userId)
   } else {
-    changerContact = room.member(changer)
+    changerContact = room.member({remark: changer}) || room.member({nick: changer})
   }
 
   if (!changerContact) {

src/room.ts

@@ -26,6 +26,8 @@ type RoomObj = {
   ownerUin:   number
   memberList: Contact[]
   nickMap:    Map<string, string>
+  remarkMap:  Map<string, string>
+  displayMap: Map<string, string>
 }
 
 export type RoomRawMember = {
@@ -52,6 +54,12 @@ export type RoomQueryFilter = {
   topic: string | RegExp
 }
 
+export type MemberQueryFilter = {
+  nick?:    string
+  remark?:  string
+  display?: string
+}
+
 export class Room extends EventEmitter implements Sayable {
   private static pool = new Map<string, Room>()
 
@@ -90,6 +98,15 @@ export class Room extends EventEmitter implements Sayable {
   //   return this.load(contactGetter)
   // }
 
+  private async readyAllMembers(memberList: RoomRawMember[]): Promise<void> {
+    let contact: Contact
+    for (let member of memberList) {
+      contact = Contact.load(member.UserName)
+      await contact.ready()
+    }
+    return
+  }
+
   public async ready(contactGetter?: (id: string) => Promise<any>): Promise<void> {
     log.silly('Room', 'ready(%s)', contactGetter ? contactGetter.constructor.name : '')
     if (!this.id) {
@@ -114,6 +131,7 @@ export class Room extends EventEmitter implements Sayable {
       const data = await contactGetter(this.id)
       log.silly('Room', `contactGetter(${this.id}) resolved`)
       this.rawObj = data
+      await this.readyAllMembers(this.rawObj.MemberList)
       this.obj    = this.parse(data)
 
       if (!this.obj) {
@@ -190,6 +208,8 @@ export class Room extends EventEmitter implements Sayable {
 
     const memberList  = this.parseMemberList(rawObj.MemberList)
     const nickMap     = this.parseNickMap(rawObj.MemberList)
+    const remarkMap   = this.parseRemarkMap(rawObj.MemberList)
+    const displayMap  = this.parseDisplayName(rawObj.MemberList)
 
     return {
       id:         rawObj.UserName,
@@ -199,6 +219,8 @@ export class Room extends EventEmitter implements Sayable {
 
       memberList,
       nickMap,
+      remarkMap,
+      displayMap,
     }
   }
 
@@ -209,23 +231,47 @@ export class Room extends EventEmitter implements Sayable {
     return rawMemberList.map(m => Contact.load(m.UserName))
   }
 
+  /**
+   * ISSUE #64 emoji need to be striped
+   * ISSUE #104 never use remark name because sys group message will never use that
+   * @rui: cannot use argument NickName because it mix real nick and remark 
+   */
   private parseNickMap(memberList: RoomRawMember[]): Map<string, string> {
     const nickMap: Map<string, string> = new Map<string, string>()
-
+    let contact: Contact
     if (memberList && memberList.map) {
       memberList.forEach(member => {
-        /**
-         * ISSUE #64 emoji need to be striped
-         * ISSUE #104 never use remark name because sys group message will never use that
-         */
-        nickMap[member.UserName] = UtilLib.stripEmoji(
-          member.DisplayName || member.NickName
-        )
+        contact = Contact.load(member.UserName)
+        nickMap[member.UserName] = UtilLib.stripEmoji(contact.name())
       })
     }
     return nickMap
   }
 
+  private parseRemarkMap(memberList: RoomRawMember[]): Map<string, string> {
+    const remarkMap: Map<string, string> = new Map<string, string>()
+    let contact: Contact
+    let remark: string | null
+    if (memberList && memberList.map) {
+      memberList.forEach(member => {
+        contact = Contact.load(member.UserName)
+        remark =  contact.remark() || ''
+        remarkMap[member.UserName] = UtilLib.stripEmoji(remark)
+      })
+    }
+    return remarkMap
+  }
+
+  private parseDisplayName(memberList: RoomRawMember[]): Map<string, string> {
+    const displayMap: Map<string, string> = new Map<string, string>()
+    if (memberList && memberList.map) {
+      memberList.forEach(member => {
+        displayMap[member.UserName] = UtilLib.stripEmoji(member.DisplayName)
+      })
+    }
+    return displayMap
+  }
+
   public dumpRaw() {
     console.error('======= dump raw Room =======')
     Object.keys(this.rawObj).forEach(k => console.error(`${k}: ${this.rawObj[k]}`))
@@ -354,28 +400,49 @@ export class Room extends EventEmitter implements Sayable {
 
     return null
   }
-
   /**
-   * NickName / DisplayName / RemarkName of member
+   * find member by `nick`(NickName) / `display`(DisplayName) / `remark`(RemarkName)
+   * when use member(name:string), find member by nickName by default
    */
-  public member(name: string): Contact | null {
-    log.verbose('Room', 'member(%s)', name)
+  public member(queryArg: MemberQueryFilter | string): Contact | null {
+    let query: MemberQueryFilter
+    if (typeof queryArg === 'string') {
+      log.error('Room', 'function member should use member(nick:name)')
+      query = { nick: queryArg }
+    } else {
+      query = queryArg
+    }
+
+    log.verbose('Room', 'member({ %s })'
+                          , Object.keys(query)
+                                  .map(k => `${k}: ${query[k]}`)
+                                  .join(', ')
+              )
+
+    if (Object.keys(query).length !== 1) {
+      throw new Error('Room member find quaryArg only support one key. multi key support is not availble now.')
+    }
 
     if (!this.obj || !this.obj.memberList) {
       log.warn('Room', 'member() not ready')
       return null
     }
+    let filterKey            = Object.keys(query)[0]
+    let filterValue: string  = UtilLib.stripEmoji(query[filterKey])
+
+    const keyMap = {
+      nick:     'nickMap',
+      remark:   'remarkMap',
+      display:  'displayMap'
+    }
 
-    /**
-     * ISSUE #64 emoji need to be striped
-     */
-    name = UtilLib.stripEmoji(name)
+    filterKey = keyMap[filterKey]
 
-    const nickMap = this.obj.nickMap
-    const idList = Object.keys(nickMap)
-                          .filter(k => nickMap[k] === name)
+    const filterMap = this.obj[filterKey]
+    const idList = Object.keys(filterMap)
+                          .filter(k => filterMap[k] === filterValue)
 
-    log.silly('Room', 'member() check nickMap: %s', JSON.stringify(nickMap))
+    log.silly('Room', 'member() check %s: %s', filterKey, JSON.stringify(filterKey))
 
     if (idList.length) {
       return Contact.load(idList[0])