From 8a5d4a683b516f14bde5cf2b5b5b800d3a0ff1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 4 Aug 2024 16:45:14 +0800 Subject: [PATCH] feat: getBuddyV2ExWithCate --- src/core/src/apis/friend.ts | 10 ++++++++-- src/onebot11/action/extends/GetFriendWithCategory.ts | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/src/apis/friend.ts b/src/core/src/apis/friend.ts index 486b8c4e..f05c9934 100644 --- a/src/core/src/apis/friend.ts +++ b/src/core/src/apis/friend.ts @@ -17,8 +17,14 @@ export class NTQQFriendApi { let uids: string[] = []; let categoryMap: Map = new Map(); const buddyService = napCatCore.session.getBuddyService(); - const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL); - uids.push(...buddyListV2.data.flatMap(item => item.buddyUids)); + const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data; + uids.push( + ...buddyListV2.flatMap(item => { + item.buddyUids.forEach(uid => { + categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName }); + }); + return item.buddyUids + })); const data = await NTEventDispatch.CallNoListenerEvent( 'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids ); diff --git a/src/onebot11/action/extends/GetFriendWithCategory.ts b/src/onebot11/action/extends/GetFriendWithCategory.ts index 5d423dc3..9f3dae9c 100644 --- a/src/onebot11/action/extends/GetFriendWithCategory.ts +++ b/src/onebot11/action/extends/GetFriendWithCategory.ts @@ -13,7 +13,7 @@ export class GetFriendWithCategory extends BaseAction { //全新逻辑 return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2ExWithCate(true)); } else { - throw new Error('not support'); + throw new Error('this ntqq version not support, must be 26702 or later'); } } }