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

#104

上级 9f44bac4
...@@ -120,8 +120,6 @@ export class Room extends EventEmitter implements Sayable { ...@@ -120,8 +120,6 @@ export class Room extends EventEmitter implements Sayable {
} }
await Promise.all(this.obj.memberList.map(c => c.ready(contactGetter))) await Promise.all(this.obj.memberList.map(c => c.ready(contactGetter)))
this.obj.nickMap = this.parseNickMap(this.obj.memberList)
return return
} catch (e) { } catch (e) {
...@@ -190,14 +188,16 @@ export class Room extends EventEmitter implements Sayable { ...@@ -190,14 +188,16 @@ export class Room extends EventEmitter implements Sayable {
} }
const memberList = this.parseMemberList(rawObj.MemberList) const memberList = this.parseMemberList(rawObj.MemberList)
const nickMap = this.parseNickMap(rawObj.MemberList)
return { return {
id: rawObj.UserName id: rawObj.UserName,
, encryId: rawObj.EncryChatRoomId // ??? encryId: rawObj.EncryChatRoomId, // ???
, topic: rawObj.NickName topic: rawObj.NickName,
, ownerUin: rawObj.OwnerUin ownerUin: rawObj.OwnerUin,
, memberList memberList,
nickMap,
} }
} }
...@@ -208,16 +208,17 @@ export class Room extends EventEmitter implements Sayable { ...@@ -208,16 +208,17 @@ export class Room extends EventEmitter implements Sayable {
return rawMemberList.map(m => Contact.load(m.UserName)) return rawMemberList.map(m => Contact.load(m.UserName))
} }
private parseNickMap(memberList: Contact[]): Map<string, string> { private parseNickMap(memberList: RoomRawMember[]): Map<string, string> {
const nickMap: Map<string, string> = new Map<string, string>() const nickMap: Map<string, string> = new Map<string, string>()
if (memberList && memberList.map) { if (memberList && memberList.map) {
memberList.forEach(contact => { memberList.forEach(member => {
/** /**
* ISSUE #64 emoji need to be striped * ISSUE #64 emoji need to be striped
* ISSUE #104 never use remark name because sys group message will never use that * ISSUE #104 never use remark name because sys group message will never use that
*/ */
nickMap[contact.UserName] = UtilLib.stripEmoji( nickMap[member.UserName] = UtilLib.stripEmoji(
contact.DisplayName || contact.NickName member.DisplayName || member.NickName
) )
}) })
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册