提交 09a7aaef 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓) 提交者: GitHub

Merge pull request #105 from JasLin/master

get room owner on event 'room-join','room-topic'
......@@ -218,7 +218,7 @@ export class Io {
case 'update':
log.verbose('Io', 'on(report): %s', ioEvent.payload)
const user = this.setting.wechaty.user()
const user = this.setting.wechaty.puppet ? this.setting.wechaty.puppet.user : null
if (user) {
const loginEvent: IoEvent = {
name: 'login'
......
......@@ -39,6 +39,7 @@ export type RoomRawObj = {
EncryChatRoomId: string
NickName: string
OwnerUin: number
ChatRoomOwner: string
MemberList: RoomRawMember[]
}
......@@ -337,9 +338,13 @@ export class Room extends EventEmitter implements Sayable {
memberList = memberList.filter(m => m.get('uin') === ownerUin)
if (memberList.length > 0) {
return memberList[0]
} else {
return null
}
if (this.rawObj.ChatRoomOwner) {
return Contact.load(this.rawObj.ChatRoomOwner)
}
return null
}
/**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册