From 717b246cb66116aa1c976fc65dcfa0373428873d 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: Fri, 9 Aug 2024 21:38:36 +0800
Subject: [PATCH] release: 1.8.5

---
 package.json                |  2 +-
 src/onebot11/constructor.ts | 12 +++++++-----
 src/onebot11/version.ts     |  2 +-
 src/webui/ui/NapCat.ts      |  2 +-
 static/assets/renderer.js   |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index bd34fa80c..987f9d38c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts
index a01be057f..c1b6fa43f 100644
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -228,16 +228,18 @@ export class OB11Constructor {
         const videoElement: VideoElement = element.videoElement;
         //读取视频链接并兜底
         let videoUrl;//Array
+        let peer:Peer = {
+          chatType: msg.chatType,
+          peerUid: msg.peerUid,
+          guildId: '0'
+        };
         if (msg.peerUin == '284840486') {
+          peer = msg.parentMsgPeer;
           //合并消息内部 应该进行特殊处理 可能需要重写peer 待测试与研究 Mlikiowa Taged TODO
         }
         try {
 
-          videoUrl = await NTQQFileApi.getVideoUrl({
-            chatType: msg.chatType,
-            peerUid: msg.peerUid,
-            guildId: '0'
-          }, msg.msgId, element.elementId);
+          videoUrl = await NTQQFileApi.getVideoUrl(peer, msg.msgId, element.elementId);
         } catch (error) {
           videoUrl = undefined;
         }
diff --git a/src/onebot11/version.ts b/src/onebot11/version.ts
index 863d57157..4446404f8 100644
--- a/src/onebot11/version.ts
+++ b/src/onebot11/version.ts
@@ -1 +1 @@
-export const version = '1.8.4';
+export const version = '1.8.5';
diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts
index bce290f85..8deb90452 100644
--- a/src/webui/ui/NapCat.ts
+++ b/src/webui/ui/NapCat.ts
@@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           undefined,
-          SettingButton('V1.8.4', 'napcat-update-button', 'secondary')
+          SettingButton('V1.8.5', 'napcat-update-button', 'secondary')
         ),
       ]),
       SettingList([
diff --git a/static/assets/renderer.js b/static/assets/renderer.js
index 3ea4bfba5..f66b64a4a 100644
--- a/static/assets/renderer.js
+++ b/static/assets/renderer.js
@@ -163,7 +163,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V1.8.4", "napcat-update-button", "secondary")
+          SettingButton("V1.8.5", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([