From dbd71d4376260c75e1d457f32c2abc16e16d60f1 Mon Sep 17 00:00:00 2001
From: idranme <96647698+idranme@users.noreply.github.com>
Date: Sun, 13 Oct 2024 23:42:01 +0800
Subject: [PATCH] chore

---
 src/ntqqapi/api/friend.ts | 2 +-
 src/ntqqapi/api/msg.ts    | 7 ++++---
 src/ntqqapi/api/user.ts   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ntqqapi/api/friend.ts b/src/ntqqapi/api/friend.ts
index ed17a09..f1ad644 100644
--- a/src/ntqqapi/api/friend.ts
+++ b/src/ntqqapi/api/friend.ts
@@ -58,7 +58,7 @@ export class NTQQFriendApi extends Service {
     return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
   }
 
-  /** uid => uin */
+  /** uid -> uin */
   async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
     const retMap: Map<string, string> = new Map()
     const data = await invoke<{
diff --git a/src/ntqqapi/api/msg.ts b/src/ntqqapi/api/msg.ts
index eb032a5..5f67c9c 100644
--- a/src/ntqqapi/api/msg.ts
+++ b/src/ntqqapi/api/msg.ts
@@ -52,7 +52,7 @@ export class NTQQMsgApi extends Service {
   }
 
   async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
-    // 默认情况下消息时间从旧到新
+    // 默认情况下消息时间从新到旧
     return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder }])
   }
 
@@ -93,7 +93,7 @@ export class NTQQMsgApi extends Service {
     const uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
     destPeer.guildId = uniqueId
     const data = await invoke<{ msgList: RawMessage[] }>(
-      'nodeIKernelMsgService/forwardMsg',
+      'nodeIKernelMsgService/forwardMsgWithComment',
       [{
         msgIds,
         srcContact: srcPeer,
@@ -111,7 +111,8 @@ export class NTQQMsgApi extends Service {
             }
           }
           return false
-        }
+        },
+        timeout: 3000
       }
     )
     delete destPeer.guildId
diff --git a/src/ntqqapi/api/user.ts b/src/ntqqapi/api/user.ts
index 77aeea0..ab1abd1 100644
--- a/src/ntqqapi/api/user.ts
+++ b/src/ntqqapi/api/user.ts
@@ -178,7 +178,7 @@ export class NTQQUserApi extends Service {
     if (uin) return uin
     uin = (await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])).uinInfo.get(uid)
     if (uin) return uin
-    uin = (await this.ctx.ntFriendApi.getBuddyIdMap(true)).get(uid)
+    uin = (await this.ctx.ntFriendApi.getBuddyIdMap()).get(uid)
     if (uin) return uin
     uin = (await this.getUserDetailInfo(uid)).uin
     return uin