From 673a175ddf11bb2ea9247bf70e7c4c32164fb65a 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?=
 <nanaeonn@outlook.com>
Date: Wed, 26 Mar 2025 21:51:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=83=98=E7=84=99raw?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/services/NodeIKernelBuddyService.ts | 2 +-
 src/onebot/action/user/GetFriendList.ts      | 4 ++--
 src/onebot/helper/data.ts                    | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/core/services/NodeIKernelBuddyService.ts b/src/core/services/NodeIKernelBuddyService.ts
index 69dcfb05..dbb98165 100644
--- a/src/core/services/NodeIKernelBuddyService.ts
+++ b/src/core/services/NodeIKernelBuddyService.ts
@@ -16,7 +16,7 @@ export interface NodeIKernelBuddyService {
 
     getBuddyListFromCache(reqType: BuddyListReqType): Promise<Array<
         {
-            categoryId: number,//9999应该跳过 那是兜底数据吧
+            categoryId: number,//9999为特别关心
             categorySortId: number,//排序方式
             categroyName: string,//分类名
             categroyMbCount: number,//不懂
diff --git a/src/onebot/action/user/GetFriendList.ts b/src/onebot/action/user/GetFriendList.ts
index 263c189d..de7526c4 100644
--- a/src/onebot/action/user/GetFriendList.ts
+++ b/src/onebot/action/user/GetFriendList.ts
@@ -14,8 +14,8 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
     override actionName = ActionName.GetFriendList;
     override payloadSchema = SchemaData;
 
-    async _handle(payload: Payload) {
+    async _handle(_payload: Payload) {
         //全新逻辑
-        return OB11Construct.friends(await this.core.apis.FriendApi.getBuddy(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache));
+        return OB11Construct.friends(await this.core.apis.FriendApi.getBuddy());
     }
 }
diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts
index 8fa7f3cd..e0380966 100644
--- a/src/onebot/helper/data.ts
+++ b/src/onebot/helper/data.ts
@@ -20,9 +20,14 @@ export class OB11Construct {
 
     static friends(friends: FriendV2[]): OB11User[] {
         return friends.map(rawFriend => ({
-            ...rawFriend.baseInfo,
-            ...rawFriend.coreInfo,
+            birthday_year: rawFriend.baseInfo.birthday_year,
+            birthday_month: rawFriend.baseInfo.birthday_month,
+            birthday_day: rawFriend.baseInfo.birthday_day,
             user_id: parseInt(rawFriend.coreInfo.uin),
+            age: rawFriend.baseInfo.age,
+            phone_num: rawFriend.baseInfo.phoneNum,
+            email: rawFriend.baseInfo.eMail,
+            category_id: rawFriend.baseInfo.categoryId,
             nickname: rawFriend.coreInfo.nick ?? '',
             remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick,
             sex: this.sex(rawFriend.baseInfo.sex),