GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #465 from cnxysoft/upmain

Browse Source 
refactor: 群成员列表获取
This commit is contained in:
Alen
2024-10-25 23:49:27 +08:00
committed by GitHub
parent 1874e48925 c3b7e111b9
commit 730c928f91
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,18 +316,41 @@ export class NTQQGroupApi {
return undefined; return undefined;
} }
async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> { async tryGetGroupMembersV2(modeListener = false, groupQQ: string, num = 30, timeout = 500): Promise<{
const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow'); infos: Map<string, GroupMember>;
const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, 2000, (params) => params.sceneId === sceneId) finish: boolean;
.catch(); }>{
const result = await this.context.session.getGroupService().getNextMemberList(sceneId!, undefined, num); 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)
.catch(() => {});
const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
if (result.errCode !== 0) { if (result.errCode !== 0) {
throw new Error('获取群成员列表出错,' + result.errMsg); throw new Error('获取群成员列表出错,' + result.errMsg);
} }
if (result.result.infos.size === 0) { let resMode2;
return (await once)[0].infos; if (modeListener) {
const ret = (await once)?.[0];
if (ret) {
resMode2 = ret;
} }
return result.result.infos; }
this.context.session.getGroupService().destroyMemberListScene(sceneId);
return {
infos: resMode2?.infos || result.result.infos,
finish: result.result.finish,
};
}
async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
let result = await this.tryGetGroupMembersV2(false, groupQQ);
if (result.finish === false || (result.infos.size === 0 && result.finish === true)) {
result = await this.tryGetGroupMembersV2(false, groupQQ, num);
if (result.finish === true && (result.infos.size === 30 || result.infos.size === 0)) {
const retListener = await this.tryGetGroupMembersV2(true, groupQQ, num);
result.infos = new Map([...retListener.infos,...result.infos]);
}
}
return result.infos;
} }
async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> { async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {

3
src/core/listeners/NodeIKernelGroupListener.ts
View File

@@ -71,7 +71,8 @@ export class NodeIKernelGroupListener {
sceneId: string, sceneId: string,
ids: string[], ids: string[],
infos: Map<string, GroupMember>, // uid -> GroupMember infos: Map<string, GroupMember>, // uid -> GroupMember
finish: boolean, hasPrev: boolean,
hasNext: boolean,
hasRobot: boolean hasRobot: boolean
}) { }) {
} }