load contact payload from room member data source (#1397)

src/puppet-padchat/puppet-padchat.ts

@@ -44,6 +44,8 @@ import {
 
   FriendshipPayload,
   FriendshipPayloadReceive,
+  ContactType,
+  ContactGender,
 }                                 from 'wechaty-puppet'
 
 import {
@@ -693,24 +695,12 @@ export class PuppetPadchat extends Puppet {
     if (!this.padchatManager) {
       throw new Error('no padchat manager')
     }
-    let rawPayload = await this.padchatManager.contactRawPayload(contactId)
+    const rawPayload = await this.padchatManager.contactRawPayload(contactId)
 
     if (!rawPayload.user_name && contactId === this.id) {
       return generateFakeSelfBot(contactId)
     }
 
-    if (!rawPayload || Object.keys(rawPayload).length <= 0) {
-      const roomList = await this.contactRoomList(contactId)
-      if (roomList.length > 0) {
-        const roomMemberPayload = await this.roomMemberPayload(roomList[0], contactId)
-        rawPayload = {
-          big_head: roomMemberPayload.avatar,
-          nick_name: roomMemberPayload.name,
-          user_name: roomMemberPayload.id,
-        } as any as PadchatContactPayload
-      }
-    }
-
     return rawPayload
   }
 
@@ -751,6 +741,44 @@ export class PuppetPadchat extends Puppet {
     return payload
   }
 
+  /**
+   * Overwrite the Puppet.contactPayload()
+   */
+  public async contactPayload(
+    contactId: string,
+  ): Promise<ContactPayload> {
+
+    const rawPayload = await this.contactRawPayload(contactId)
+
+    /**
+     * Issue #1397
+     *  https://github.com/Chatie/wechaty/issues/1397#issuecomment-400962638
+     *
+     * Try to use the contact information from the room
+     * when it is not available directly
+     */
+    if (!rawPayload || Object.keys(rawPayload).length <= 0) {
+      const roomList = await this.contactRoomList(contactId)
+      if (roomList.length > 0) {
+        const roomId = roomList[0]
+        const roomMemberPayload = await this.roomMemberPayload(roomId, contactId)
+        if (roomMemberPayload) {
+          const payload: ContactPayload = {
+            avatar : roomMemberPayload.avatar,
+            name   : roomMemberPayload.name,
+            id     : roomMemberPayload.id,
+            gender : ContactGender.Unknown,
+            type   : ContactType.Personal,
+          }
+          return payload
+        }
+      }
+      throw new Error('no raw payload')
+    }
+
+    return await this.contactRawPayloadParser(rawPayload)
+  }
+
   /**
    *
    * Message
@@ -972,6 +1000,8 @@ export class PuppetPadchat extends Puppet {
       id        : rawPayload.user_name,
       inviterId : rawPayload.invited_by,
       roomAlias : rawPayload.chatroom_nick_name,
+      avatar    : rawPayload.big_head,
+      name      : rawPayload.nick_name,
     }
 
     return payload

src/puppet-puppeteer/puppet-puppeteer.ts

@@ -861,10 +861,14 @@ export class PuppetPuppeteer extends Puppet {
     //   // console.log(aliasDict)
     // }
 
+    const memberIdList = rawPayload.MemberList
+                          ? rawPayload.MemberList.map(m => m.UserName)
+                          : []
+
     const roomPayload: RoomPayload = {
       id,
-      topic:      Misc.plainText(rawPayload.NickName || ''),
-      // memberIdList,
+      topic: Misc.plainText(rawPayload.NickName || ''),
+      memberIdList,
       // aliasDict,
       // nameMap,
       // roomAliasMap,
@@ -1008,6 +1012,8 @@ export class PuppetPuppeteer extends Puppet {
     const payload: RoomMemberPayload = {
       id        : rawPayload.UserName,
       roomAlias : rawPayload.DisplayName,
+      name      : rawPayload.NickName,
+      avatar    : rawPayload.HeadImgUrl,
     }
     return payload
   }

src/puppet-puppeteer/web-schemas.ts

@@ -279,9 +279,10 @@ export const enum WebMediaType {
 }
 
 export interface WebRoomRawMember {
-  UserName:     string,
-  NickName:     string,
-  DisplayName:  string,
+  UserName    : string,
+  NickName    : string,
+  DisplayName : string,
+  HeadImgUrl  : string,
 }
 
 export interface WebRoomRawPayload {

src/puppet-wechat4u/puppet-wechat4u.ts

@@ -650,10 +650,14 @@ export class PuppetWechat4u extends Puppet {
     //   })
     // }
 
+    const memberIdList = rawPayload.MemberList
+                          ? rawPayload.MemberList.map(m => m.UserName)
+                          : []
+
     const roomPayload: RoomPayload = {
       id,
       topic:      rawPayload.NickName || '',
-      // memberIdList,
+      memberIdList,
       // aliasDict,
     }
     return roomPayload
@@ -780,6 +784,8 @@ export class PuppetWechat4u extends Puppet {
     const payload: RoomMemberPayload = {
       id        : rawPayload.UserName,
       roomAlias : rawPayload.DisplayName,
+      name      : rawPayload.NickName,
+      avatar    : rawPayload.HeadImgUrl,
     }
     return payload
   }

src/puppet-wechat4u/web-schemas.ts

@@ -279,9 +279,10 @@ export const enum WebMediaType {
 }
 
 export interface WebRoomRawMember {
-  UserName:     string,
-  NickName:     string,
-  DisplayName:  string,
+  UserName    : string,
+  NickName    : string,
+  DisplayName : string,
+  HeadImgUrl  : string,
 }
 
 export interface WebRoomRawPayload {