Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
72d34801
W
wechaty
项目概览
.Veneno.
/
wechaty
与 Fork 源项目一致
Fork自
wechaty / wechaty
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wechaty
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
72d34801
编写于
6月 13, 2018
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
retry to search new members on room join event. (#1324)
上级
c130f7fe
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
44 addition
and
9 deletion
+44
-9
src/puppet-padchat/padchat-manager.ts
src/puppet-padchat/padchat-manager.ts
+9
-1
src/puppet-padchat/puppet-padchat.ts
src/puppet-padchat/puppet-padchat.ts
+35
-7
src/puppet/puppet.ts
src/puppet/puppet.ts
+0
-1
未找到文件。
src/puppet-padchat/padchat-manager.ts
浏览文件 @
72d34801
...
...
@@ -660,12 +660,20 @@ export class PadchatManager extends PadchatRpc {
return
roomIdList
}
public
async
getRoomMemberIdList
(
roomId
:
string
):
Promise
<
string
[]
>
{
public
async
getRoomMemberIdList
(
roomId
:
string
,
noCache
=
false
,
):
Promise
<
string
[]
>
{
log
.
verbose
(
'
PuppetPadchatManager
'
,
'
getRoomMemberIdList(%d)
'
,
roomId
)
if
(
!
this
.
cacheRoomMemberRawPayload
)
{
throw
new
Error
(
'
cache not inited
'
)
}
if
(
noCache
)
{
log
.
verbose
(
'
PuppetPadchatManager
'
,
'
getRoomMemberIdList(%d) cache PURGE
'
,
roomId
)
this
.
cacheRoomMemberRawPayload
.
delete
(
roomId
)
}
const
memberRawPayloadDict
=
this
.
cacheRoomMemberRawPayload
.
get
(
roomId
)
||
await
this
.
syncRoomMember
(
roomId
)
...
...
src/puppet-padchat/puppet-padchat.ts
浏览文件 @
72d34801
...
...
@@ -28,6 +28,8 @@ import {
FileBox
,
}
from
'
file-box
'
import
Misc
from
'
../misc
'
import
{
ContactPayload
,
...
...
@@ -333,19 +335,45 @@ export class PuppetPadchat extends Puppet {
const
inviterName
=
roomJoin
.
inviterName
const
roomId
=
roomJoin
.
roomId
const
inviteeIdList
=
flatten
<
string
>
(
const
inviteeIdList
=
await
Misc
.
retry
(
async
(
retry
,
attempt
)
=>
{
log
.
verbose
(
'
PuppetPadchat
'
,
'
onPadchatMessageRoomEvent({id=%s}) roomJoin retry(attempt=%d)
'
,
attempt
)
const
tryIdList
=
flatten
<
string
>
(
await
Promise
.
all
(
inviteeNameList
.
map
(
inviteeName
=>
this
.
roomMemberSearch
(
roomId
,
inviteeName
),
),
),
)
if
(
tryIdList
.
length
)
{
return
tryIdList
}
if
(
!
this
.
bridge
)
{
throw
new
Error
(
'
no manager
'
)
}
/**
* PURGE Cache and Reload
*/
await
this
.
bridge
.
getRoomMemberIdList
(
roomId
,
true
)
return
retry
(
new
Error
(
'
roomMemberSearch() not found
'
))
}).
catch
(
e
=>
{
log
.
warn
(
'
PuppetPadchat
'
,
'
onPadchatMessageRoomEvent({id=%s}) roomJoin retry() fail: %s
'
,
e
.
message
)
return
[]
as
string
[]
})
const
inviterIdList
=
await
this
.
roomMemberSearch
(
roomId
,
inviterName
)
if
(
inviterIdList
.
length
<
1
)
{
throw
new
Error
(
'
no inviterId found
'
)
}
else
if
(
inviterIdList
.
length
>
1
)
{
log
.
warn
(
'
PuppetPadchat
'
,
'
onPadchatMessageRoomEvent() case PadchatMesssageSys: inviterId found more than 1, use the first one.
'
)
}
const
inviterId
=
inviterIdList
[
0
]
this
.
emit
(
'
room-join
'
,
roomId
,
inviteeIdList
,
inviterId
)
...
...
src/puppet/puppet.ts
浏览文件 @
72d34801
...
...
@@ -695,7 +695,6 @@ export abstract class Puppet extends EventEmitter implements Sayable {
/**
* 2. for RoomMemberQueryFilter
*/
// const roomPayload = await this.roomPayload(roomId)
const
memberIdList
=
await
this
.
roomMemberList
(
roomId
)
let
idList
:
string
[]
=
[]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录