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:
手瓜一十雪 2024-11-09 18:21:50 +08:00
parent 5d6dee9fd0
commit d02afdfc3e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,8 +375,10 @@ export class NTQQGroupApi {
}; };
} }
async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> { async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
//console.log('getGroupMembers -->', groupQQ); if (no_cache) {
return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
}
let res = await this.GetGroupMembersV3(groupQQ, num); let res = await this.GetGroupMembersV3(groupQQ, num);
let ret = res.infos; let ret = res.infos;
if (res.infos.size === 0 && !res.listenerMode) { if (res.infos.size === 0 && !res.listenerMode) {
@ -386,14 +388,13 @@ export class NTQQGroupApi {
if (res.infos.size === 0) { if (res.infos.size === 0) {
ret = (await this.getGroupMemberAll(groupQQ)).result.infos; ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
} }
//console.log("<---------------")
return ret; return ret;
} }
async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> { async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
const groupService = this.context.session.getGroupService(); const groupService = this.context.session.getGroupService();
const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow'); const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
const result = await groupService.getNextMemberList(sceneId!, undefined, num); const result = await groupService.getNextMemberList(sceneId, undefined, num);
if (result.errCode !== 0) { if (result.errCode !== 0) {
throw new Error('获取群成员列表出错,' + result.errMsg); throw new Error('获取群成员列表出错,' + result.errMsg);
} }
@ -401,8 +402,8 @@ export class NTQQGroupApi {
return result.result.infos; return result.result.infos;
} }
async getGroupFileCount(Gids: Array<string>) { async getGroupFileCount(group_ids: Array<string>) {
return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids); return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
} }
async getArkJsonGroupShare(GroupCode: string) { async getArkJsonGroupShare(GroupCode: string) {

7
src/onebot/action/group/GetGroupMemberList.ts
View File

@ -24,12 +24,11 @@ export class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false; const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false;
const memberCache = this.core.apis.GroupApi.groupMemberCache; const memberCache = this.core.apis.GroupApi.groupMemberCache;
let groupMembers; let groupMembers;
if (noCache) { try {
groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr); groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr, 3000, noCache);
} else { } catch (error) {
groupMembers = memberCache.get(groupIdStr) ?? await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr); groupMembers = memberCache.get(groupIdStr) ?? await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
} }
const memberPromises = Array.from(groupMembers.values()).map(item => const memberPromises = Array.from(groupMembers.values()).map(item =>
OB11Entities.groupMember(groupIdStr, item) OB11Entities.groupMember(groupIdStr, item)
); );