diff --git a/package.json b/package.json index bd34fa80..987f9d38 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 a01be057..c1b6fa43 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 863d5715..4446404f 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 bce290f8..8deb9045 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -29,7 +29,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', 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 3ea4bfba..f66b64a4 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -163,7 +163,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V1.8.4", "napcat-update-button", "secondary") + SettingButton("V1.8.5", "napcat-update-button", "secondary") ) ]), SettingList([