From c07bf5ff5580e7804d9295e86ebfb69789d1bb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=89=E8=8F=9C?= <1659488338@qq.com>
Date: Fri, 27 Sep 2024 11:00:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json             | 10 +++++++---
 src/adapters/qq/index.ts | 28 ++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 2f2b641..2dae9fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.93",
+  "version": "0.4.94",
   "description": "基于icqq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {
@@ -52,6 +52,10 @@
     "@types/node": "latest",
     "@types/ws": "^8.5.3",
     "@vitejs/plugin-vue": "^5.0.0",
+    "@icqqjs/icqq": "latest",
+    "node-dd-bot": "latest",
+    "qq-official-bot": "latest",
+    "web-wechat": "latest",
     "dayjs": "^1.11.10",
     "element-plus": "^2.4.4",
     "prettier": "^3.0.0",
@@ -77,9 +81,9 @@
   ],
   "peerDependencies": {
     "@icqqjs/icqq": "latest",
-    "web-wechat": "latest",
     "node-dd-bot": "latest",
-    "qq-official-bot": "latest"
+    "qq-official-bot": "latest",
+    "web-wechat": "latest"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
diff --git a/src/adapters/qq/index.ts b/src/adapters/qq/index.ts
index 4110b88..01d7f4e 100644
--- a/src/adapters/qq/index.ts
+++ b/src/adapters/qq/index.ts
@@ -80,8 +80,11 @@ export default class QQAdapter extends Adapter<"qq", Sendable> {
         return {
             message_id:
                 version === "V11"
-                    ? bot.V11.transformToInt("message_id", `group:${group_id}${result.id}`)
-                    : `group:${group_id}${result.id}`,
+                    ? bot.V11.transformToInt(
+                          "message_id",
+                          `group:${group_id}${result["id"] || result["file_uuid"]}`,
+                      )
+                    : `group:${group_id}${result["id"] || result["file_uuid"]}`,
         } as OneBot.MessageRet<V>;
     }
     async sendPrivateMessage<V extends OneBot.Version>(
@@ -107,8 +110,11 @@ export default class QQAdapter extends Adapter<"qq", Sendable> {
         return {
             message_id:
                 version === "V11"
-                    ? bot.V11.transformToInt("message_id", `private:${user_id}${result.id}`)
-                    : `private:${user_id}${result.id}`,
+                    ? bot.V11.transformToInt(
+                          "message_id",
+                          `private:${user_id}${result["id"] || result["file_uuid"]}`,
+                      )
+                    : `private:${user_id}${result["id"] || result["file_uuid"]}`,
         } as OneBot.MessageRet<V>;
     }
 
@@ -125,8 +131,11 @@ export default class QQAdapter extends Adapter<"qq", Sendable> {
         return {
             message_id:
                 version === "V11"
-                    ? bot.V11.transformToInt("message_id", `${guild_id}:${channel_id}${result.id}`)
-                    : `${guild_id}:${channel_id}${result.id}`,
+                    ? bot.V11.transformToInt(
+                          "message_id",
+                          `${guild_id}:${channel_id}${result["id"] || result["file_uuid"]}`,
+                      )
+                    : `${guild_id}:${channel_id}${result["id"] || result["file_uuid"]}`,
         } as OneBot.MessageRet<V>;
     }
     async sendDirectMessage<V extends OneBot.Version>(
@@ -142,8 +151,11 @@ export default class QQAdapter extends Adapter<"qq", Sendable> {
         return {
             message_id:
                 version === "V11"
-                    ? bot.V11.transformToInt("message_id", `direct:${guild_id}${result.id}`)
-                    : `direct:${guild_id}${result.id}`,
+                    ? bot.V11.transformToInt(
+                          "message_id",
+                          `direct:${guild_id}${result["id"] || result["file_uuid"]}`,
+                      )
+                    : `direct:${guild_id}${result["id"] || result["file_uuid"]}`,
         } as OneBot.MessageRet<V>;
     }
     async deleteMessage(uin: string, version: "V11" | "V12", [message_id]: [string]) {