GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 群成员拉取

Browse Source
This commit is contained in:
Alen 2024-10-25 21:50:19 +08:00
parent 2f08b72d69
commit 5d4f45407e
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/apis/group.ts
View File

@ -316,7 +316,10 @@ export class NTQQGroupApi {
return undefined; return undefined;
} }
async tryGetGroupMembersV2(modeListener = false, groupQQ: string, num = 30, timeout = 500): Promise<any> { async tryGetGroupMembersV2(modeListener = false, groupQQ: string, num = 30, timeout = 500): Promise<{
infos: Map<string, GroupMember>;
finish: boolean;
}>{
const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1'); const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, timeout, (params) => params.sceneId === sceneId) const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, timeout, (params) => params.sceneId === sceneId)
.catch(() => {}); .catch(() => {});
@ -332,28 +335,18 @@ export class NTQQGroupApi {
} }
} }
this.context.session.getGroupService().destroyMemberListScene(sceneId); this.context.session.getGroupService().destroyMemberListScene(sceneId);
return resMode2 || result.result; return {
infos: resMode2?.infos || result.result.infos,
finish: result.result.finish,
};
} }
async getGroupMembersV2(groupQQ: string): Promise<Map<string, GroupMember>> { async getGroupMembersV2(groupQQ: string): Promise<Map<string, GroupMember>> {
type Ret = { let result = await this.tryGetGroupMembersV2(false, groupQQ);
infos: Map<string, GroupMember>; if (result.finish === false || result.infos.size === 0 && result.finish === true) {
finish: boolean;
hasNext: boolean;
}
let result = await this.tryGetGroupMembersV2(false, groupQQ) as unknown as Ret;
const retOneSize = result.infos.size;
if (result.infos.size === 0 && result.finish === true) {
result = await this.tryGetGroupMembersV2(true, groupQQ);
if (result.hasNext === true) {
result = await this.tryGetGroupMembersV2(false, groupQQ, 3000);
}
return result.infos;
}
if (result.finish === false) {
result = await this.tryGetGroupMembersV2(false, groupQQ, 3000); result = await this.tryGetGroupMembersV2(false, groupQQ, 3000);
if (result.finish === true && result.infos.size === retOneSize) { if (result.finish === true && (result.infos.size === 30 || result.infos.size === 0)) {
const retListener = await this.tryGetGroupMembersV2(true, groupQQ, 3000, 5000); const retListener = await this.tryGetGroupMembersV2(true, groupQQ, 3000);
result.infos = new Map([...retListener.infos,...result.infos]); result.infos = new Map([...retListener.infos,...result.infos]);
} }
} }