Merge branch 'dev'

Author: idranme

doc/更新日志.txt

@@ -1,3 +1,10 @@
+V8.1.10
+更新时间 2026-09-04
+
+* 修复机器人自身发出的私聊文件被对方下载后错误上报事件
+* 修复 OneBot 上报骰子消息时缺少骰面点数
+
+=================
 V8.1.9
 更新时间 2026-08-20
 

package-dist.json

@@ -1 +1 @@
-{"name":"llonebot-dist","version":"8.1.9","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}
+{"name":"llonebot-dist","version":"8.1.10","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}

package.json

@@ -23,28 +23,28 @@
     "@cordisjs/plugin-database": "^4.1.1",
     "@cordisjs/plugin-database-sqlite": "^5.1.1",
     "@cordisjs/plugin-logger-console": "^1.0.0",
-    "@cordisjs/plugin-timer": "^1.1.2",
+    "@cordisjs/plugin-timer": "^1.1.3",
     "@hono/node-server": "^2.1.1",
     "@saltify/typeproto": "^0.4.1",
     "@satorijs/element": "^3.2.0",
     "@satorijs/protocol": "^1.7.0",
     "compare-versions": "^6.1.1",
-    "cordis": "4.0.0-rc.8",
+    "cordis": "4.0.0-rc.9",
     "cosmokit": "^1.8.1",
-    "fast-xml-parser": "^5.10.1",
-    "file-type": "^22.0.1",
+    "fast-xml-parser": "^5.11.1",
+    "file-type": "^22.0.2",
     "fluent-ffmpeg": "^2.1.3",
     "get-port": "^7.2.0",
-    "hono": "^4.13.2",
+    "hono": "^4.13.5",
     "image-size": "^2.0.2",
     "json5": "^2.2.3",
-    "nodemailer": "^9.0.5",
+    "nodemailer": "^9.1.1",
     "qrcode": "^1.5.4",
     "schemastery": "^3.18.0",
     "sift": "^17.1.3",
     "silk-wasm": "^3.7.1",
     "ws": "^8.21.3",
-    "zod": "^4.4.3"
+    "zod": "^4.5.4"
   },
   "devDependencies": {
     "@types/fluent-ffmpeg": "^2.1.28",
@@ -54,11 +54,11 @@
     "@types/ws": "^8.18.1",
     "milkygen": "^0.3.3",
     "ts-case-convert": "^2.3.1",
-    "tsx": "^4.23.12",
+    "tsx": "^4.23.13",
     "typescript": "^7.0.2",
-    "vite": "^8.2.1",
-    "vite-plugin-cp": "^6.0.3",
-    "vitest": "^4.1.10"
+    "vite": "^8.2.2",
+    "vite-plugin-cp": "^8.0.1",
+    "vitest": "^4.1.11"
   },
   "packageManager": "yarn@4.18.0"
 }

src/ntqqapi/dispatcher.ts

@@ -846,23 +846,25 @@ export function convertToRawMessage(msg: InferProtoModel<typeof Msg.Message>, ra
   // C2C 离线文件（trans 0x211 + msgType=PrivateFile）：内容在 body.msgContent 而不是 richText.elems
   if (msgType === MsgType.PrivateFile && body?.msgContent && elements.length === 0) {
     try {
-      const fe = Msg.FileExtra.decode(Buffer.from(body.msgContent))
+      const fe = Msg.FileExtra.decode(body.msgContent)
       const nof = fe.file
-      if (nof) {
-        elements.push({
-          elementType: ElementType.File,
-          fileElement: {
-            fileName: nof.fileName,
-            fileSize: nof.fileSize,
-            fileMd5: nof.fileMd5 ? Buffer.from(nof.fileMd5).toString('hex') : '',
-            expireTime: nof.expireTime,
-            fileUuid: nof.fileUuid,
-            fileBizId: 0,
-            filePath: '',
-            folderId: ''
-          },
-        })
+      // 当 bot 自身发出的文件被对方下载后，会触发 fileType=1
+      if (nof.fileType !== 0) {
+        return null
       }
+      elements.push({
+        elementType: ElementType.File,
+        fileElement: {
+          fileName: nof.fileName,
+          fileSize: nof.fileSize,
+          fileMd5: nof.fileMd5 ? nof.fileMd5.toString('hex') : '',
+          expireTime: nof.expireTime,
+          fileUuid: nof.fileUuid,
+          fileBizId: 0,
+          filePath: '',
+          folderId: ''
+        }
+      })
     } catch (e) {
       logger.warn('PrivateFile FileExtra decode failed:', (e as Error).message)
     }

src/ntqqapi/helper/messageParsing.ts

@@ -308,7 +308,7 @@ export function parseElements(
             packId: ext.aniStickerPackId,
             stickerId: ext.aniStickerId,
             stickerType: ext.aniStickerType,
-            resultId: ext.resultId !== undefined ? String(ext.resultId) : undefined,
+            resultId: ext.resultId,
           },
         })
         break

src/ntqqapi/proto/msg.ts

@@ -385,11 +385,9 @@ export namespace Msg {
     faceId: ProtoField(3, 'int32', 'optional'),
     field4: ProtoField(4, 'int32', 'optional'),
     aniStickerType: ProtoField(5, 'int32', 'optional'),
-    field6: ProtoField(6, 'string', 'optional'),
+    resultId: ProtoField(6, 'string', 'optional'),
     preview: ProtoField(7, 'string', 'optional'),
     field9: ProtoField(9, 'int32', 'optional'),
-    /** dice/rps 才有：1-6 / 1-3 表示骰子点数或猜拳手势 */
-    resultId: ProtoField(11, 'int32', 'optional'),
   })
 
   export const GroupFileExtra = ProtoMessage.of({

src/version.ts

@@ -1 +1 @@
-export const version = '8.1.9'
+export const version = '8.1.10'