From a53aaa456ef922b6e45fb8b05bc7c0235faac948 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: Sun, 4 Aug 2024 18:49:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E5=A4=84=E5=BE=88=E4=B9=85?=
 =?UTF-8?q?=E5=BE=88=E4=B9=85=E7=9A=84=E7=9C=8B=E9=94=99=E7=9A=84=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/src/apis/user.ts                            | 12 +++++++++---
 .../src/services/NodeIKernelUixConvertService.ts     |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core/src/apis/user.ts b/src/core/src/apis/user.ts
index edc1fdd2..953866d3 100644
--- a/src/core/src/apis/user.ts
+++ b/src/core/src/apis/user.ts
@@ -229,25 +229,31 @@ export class NTQQUserApi {
     return await NTQQUserApi.getUinByUidV1(Uid);
   }
 
+  //后期改成流水线处理
   static async getUidByUinV2(Uin: string) {
     let uid = (await napCatCore.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin);
     if (uid) return uid;
     uid = (await napCatCore.session.getGroupService().getUidByUins([Uin])).uids.get(Uin);
     if (uid) return uid;
+    uid = (await napCatCore.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
+    if (uid) return uid;
     uid = (await NTQQFriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid
     if (uid) return uid;
     uid = (await NTQQFriendApi.getBuddyIdMap(true)).getValue(Uin);
     if (uid) return uid;
     let unveifyUid = (await NTQQUserApi.getUserDetailInfoByUin(Uin)).info.uid;//从QQ Native 特殊转换
     if (unveifyUid.indexOf("*") == -1) uid = unveifyUid;
-    if (uid) return uid;
-    return uid;
+
+    if (uid) return uid; return uid;
   }
+  //后期改成流水线处理
   static async getUinByUidV2(Uid: string) {
     let uin = (await napCatCore.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid);
     if (uin) return uin;
     uin = (await napCatCore.session.getGroupService().getUinByUids([Uid])).uins.get(Uid);
     if (uin) return uin;
+    uin = (await napCatCore.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
+    if (uin) return uin;
     uin = (await NTQQFriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin
     if (uin) return uin;
     uin = (await NTQQFriendApi.getBuddyIdMap(true)).getKey(Uid);
@@ -258,7 +264,7 @@ export class NTQQUserApi {
 
   static async getUidByUinV1(Uin: string) {
     // 通用转换开始尝试
-    let uid = (await napCatCore.session.getUixConvertService().getUid([Uin])).uinInfo.get(Uin);
+    let uid = (await napCatCore.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
     // Uid 好友转
     if (!uid) {
       Array.from(friends.values()).forEach((t) => {
diff --git a/src/core/src/services/NodeIKernelUixConvertService.ts b/src/core/src/services/NodeIKernelUixConvertService.ts
index c4d28471..b203c481 100644
--- a/src/core/src/services/NodeIKernelUixConvertService.ts
+++ b/src/core/src/services/NodeIKernelUixConvertService.ts
@@ -1,5 +1,5 @@
 export interface NodeIKernelUixConvertService {
-    getUin(uid: string[]): Promise<{ uidInfo: Map<string, string> }>;
+    getUin(uid: string[]): Promise<{ uinInfo: Map<string, string> }>;
 
-    getUid(uin: string[]): Promise<{ uinInfo: Map<string, string> }>;
+    getUid(uin: string[]): Promise<{ uidInfo: Map<string, string> }>;
 }
\ No newline at end of file