From 7bcea147995d0f44f32c49c294b434646c8b75ef Mon Sep 17 00:00:00 2001 From: 123233513 <37925595+123233513@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:41:04 +0800 Subject: [PATCH 1/9] Update launcher.bat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit %RetString% 增加引号，解决QQ目录包含空格的问题，比如安装在：C:\Program Files\Tencent\QQNT时，获取不到正确的路径 --- launcher/launcher.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/launcher/launcher.bat b/launcher/launcher.bat index 965624b1..3ceff3bc 100644 --- a/launcher/launcher.bat +++ b/launcher/launcher.bat @@ -21,7 +21,8 @@ for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\M ) :napcat_boot -for %%a in (%RetString%) do ( +:: %RetString% 增加引号，解决QQ目录包含空格的问题，比如安装在：C:\Program Files\Tencent\QQNT +for %%a in ("%RetString%") do ( set "pathWithoutUninstall=%%~dpa" ) From c20362e9b60c4c9956195063d65c0ceb98a70021 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?= Date: Thu, 5 Sep 2024 14:00:57 +0800 Subject: [PATCH 2/9] release: 2.3.0 --- launcher/NapCatWinBootHook.dll | Bin 11264 -> 11264 bytes launcher/NapCatWinBootMain.exe | Bin 22016 -> 22016 bytes launcher/launcher-win10.bat | 39 +++++++++++++++++++++++++++++++++ manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 8 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 launcher/launcher-win10.bat diff --git a/launcher/NapCatWinBootHook.dll b/launcher/NapCatWinBootHook.dll index ee797fc92bf6887017f045278b866fb48cc86898..4f03788bc0e5c50ffb89fc47f7e5577a0622dd53 100644 GIT binary patch delta 23 ccmZpOXo#5bgL#(w&5gfzN`UCi+a*1P0E=M@4gdfE delta 23 ccmZpOXo#5bgE=Ap#>U?}B|!A%?UJ5C0EtZs=l}o! diff --git a/launcher/NapCatWinBootMain.exe b/launcher/NapCatWinBootMain.exe index 509927021df4ba7f8fcc1476b6dca313ba491e03..be02e30ecb0b591758b832a80cef68221d226979 100644 GIT binary patch delta 6094 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 p!xbp~^C^iq)0t3nEh5pnul 2>&1 +if %errorLevel% == 0 ( + echo Administrator mode detected. +) else ( + echo Please run this script in administrator mode. + powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\"' -Verb runAs" + exit +) + +set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js +set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js +set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll +set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe +set NAPCAT_MAIN_PATH=%cd%\napcat.mjs +:loop_read +for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do ( + set RetString=%%b + goto :napcat_boot +) + +:napcat_boot +for %%a in (%RetString%) do ( + set "pathWithoutUninstall=%%~dpa" +) + +SET QQPath=%pathWithoutUninstall%QQ.exe + +REM 拿不到QQ路径则退出 +if not exist "%QQpath%" ( + echo provided QQ path is invalid: %QQpath% + pause + exit /b +) +set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/% +echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH% + +"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" \ No newline at end of file diff --git a/manifest.json b/manifest.json index a01452e1..8d322fc5 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.2.47", + "version": "2.3.0", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 78d802a1..c7c3631e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.2.47", + "version": "2.3.0", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index 3c1caf38..c849f8ee 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '2.2.47'; +export const napCatVersion = '2.3.0'; diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 3f77f79b..5206028b 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.2.47', 'napcat-update-button', 'secondary'), + SettingButton('V2.3.0', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 7df30e44..820815dd 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.2.47", "napcat-update-button", "secondary") + SettingButton("V2.3.0", "napcat-update-button", "secondary") ) ]), SettingList([ From a01e4ca89fadadb60f66888c580a0fa7e9a391a3 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?= Date: Thu, 5 Sep 2024 14:03:03 +0800 Subject: [PATCH 3/9] release: 2.3.1 --- launcher/launcher-win10.bat | 3 +-- launcher/launcher.bat | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/launcher/launcher-win10.bat b/launcher/launcher-win10.bat index 6c1dbb5d..17a9722f 100644 --- a/launcher/launcher-win10.bat +++ b/launcher/launcher-win10.bat @@ -21,13 +21,12 @@ for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\M ) :napcat_boot -for %%a in (%RetString%) do ( +for %%a in ("%RetString%") do ( set "pathWithoutUninstall=%%~dpa" ) SET QQPath=%pathWithoutUninstall%QQ.exe -REM 拿不到QQ路径则退出 if not exist "%QQpath%" ( echo provided QQ path is invalid: %QQpath% pause diff --git a/launcher/launcher.bat b/launcher/launcher.bat index 3ceff3bc..84be339a 100644 --- a/launcher/launcher.bat +++ b/launcher/launcher.bat @@ -21,7 +21,6 @@ for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\M ) :napcat_boot -:: %RetString% 增加引号，解决QQ目录包含空格的问题，比如安装在：C:\Program Files\Tencent\QQNT for %%a in ("%RetString%") do ( set "pathWithoutUninstall=%%~dpa" ) @@ -33,6 +32,7 @@ if not exist "%QQpath%" ( pause exit /b ) + set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/% echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH% From e80a1cc64aedfc5182ca4b16a9fbbab78e9e07f0 Mon Sep 17 00:00:00 2001 From: Version Date: Thu, 5 Sep 2024 06:03:22 +0000 Subject: [PATCH 4/9] chore:version change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7c3631e..6f3fe493 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.3.0", + "version": "2.3.1", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", From b83c41ad56e0c15f885f7d93a777f48eebbd15c1 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?= Date: Thu, 5 Sep 2024 14:55:11 +0800 Subject: [PATCH 5/9] fix: #339 --- manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- src/core/apis/file.ts | 59 ------------------------------------- src/onebot/api/msg.ts | 61 +++------------------------------------ src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 7 files changed, 9 insertions(+), 121 deletions(-) diff --git a/manifest.json b/manifest.json index 8d322fc5..72379365 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "2.3.0", + "version": "2.3.2", "icon": "./logo.png", "authors": [ { diff --git a/package.json b/package.json index 6f3fe493..0383d3a8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "napcat", "private": true, "type": "module", - "version": "2.3.1", + "version": "2.3.2", "scripts": { "build:framework": "vite build --mode framework", "build:shell": "vite build --mode shell", diff --git a/src/common/version.ts b/src/common/version.ts index c849f8ee..542c094a 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -1 +1 @@ -export const napCatVersion = '2.3.0'; +export const napCatVersion = '2.3.2'; diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 55fce983..2d1e7f05 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -298,65 +298,6 @@ export class NTQQFileApi { }); } - async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) { - let GroupData; - let BuddyData; - if (peer.chatType === ChatType.KCHATTYPEGROUP) { - GroupData = - [{ - groupCode: peer.peerUid, - isConf: false, - hasModifyConfGroupFace: true, - hasModifyConfGroupName: true, - groupName: 'NapCat.Cached', - remark: 'NapCat.Cached', - }]; - } else if (peer.chatType === ChatType.KCHATTYPEC2C) { - BuddyData = [{ - category_name: 'NapCat.Cached', - peerUid: peer.peerUid, - peerUin: peer.peerUid, - remark: 'NapCat.Cached', - }]; - } else { - return undefined; - } - - return this.context.session.getSearchService().addSearchHistory({ - type: 4, - contactList: [], - id: -1, - groupInfos: [], - msgs: [], - fileInfos: [ - { - chatType: peer.chatType, - buddyChatInfo: BuddyData || [], - discussChatInfo: [], - groupChatInfo: GroupData || [], - dataLineChatInfo: [], - tmpChatInfo: [], - msgId: msgId, - msgSeq: msgSeq, - msgTime: Math.floor(Date.now() / 1000).toString(), - senderUid: senderUid, - senderNick: 'NapCat.Cached', - senderRemark: 'NapCat.Cached', - senderCard: 'NapCat.Cached', - elemId: elemId, - elemType: elemType, - fileSize: fileSize, - filePath: '', - fileName: fileName, - hits: [{ - start: 12, - end: 14, - }], - }, - ], - }); - } - async searchForFile(keys: string[]): Promise { const randomResultId = 100000 + Math.floor(Math.random() * 10000); let searchId = 0; diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 85689dba..abf9e3e5 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -115,6 +115,7 @@ export class OneBotMsgApi { file_id: encodedFileId, url: await this.core.apis.FileApi.getImageUrl(element), file_size: element.fileSize, + file_unique: element.fileName }, }; } catch (e: any) { @@ -129,20 +130,6 @@ export class OneBotMsgApi { peerUid: msg.peerUid, guildId: '', }; - await this.core.apis.FileApi.addFileCache( - { - peerUid: msg.peerUid, - chatType: msg.chatType, - guildId: '', - }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - elementWrapper.elementId, - elementWrapper.elementType.toString(), - element.fileSize, - element.fileName, - ); return { type: OB11MessageDataType.file, data: { @@ -151,6 +138,7 @@ export class OneBotMsgApi { url: element.filePath, file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId), file_size: element.fileSize, + file_unique: element.fileName, }, }; }, @@ -182,20 +170,6 @@ export class OneBotMsgApi { }, marketFaceElement: async (_, msg, elementWrapper) => { - await this.core.apis.FileApi.addFileCache( - { - peerUid: msg.peerUid, - chatType: msg.chatType, - guildId: '', - }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - elementWrapper.elementId, - elementWrapper.elementType.toString(), - '0', - 'marketface', - ); const peer = { chatType: msg.chatType, peerUid: msg.peerUid, @@ -208,6 +182,7 @@ export class OneBotMsgApi { file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId), path: elementWrapper.elementId, url: elementWrapper.elementId, + file_unique: _.key }, }; }, @@ -283,21 +258,6 @@ export class OneBotMsgApi { videoDownUrl = element.filePath; } - await this.core.apis.FileApi.addFileCache( - { - peerUid: msg.peerUid, - chatType: msg.chatType, - guildId: '', - }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - elementWrapper.elementId, - elementWrapper.elementType.toString(), - element.fileSize ?? '0', - element.fileName, - ); - return { type: OB11MessageDataType.video, data: { @@ -306,6 +266,7 @@ export class OneBotMsgApi { url: videoDownUrl, file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId), file_size: element.fileSize, + file_unique: element.fileName, }, }; }, @@ -316,20 +277,6 @@ export class OneBotMsgApi { peerUid: msg.peerUid, guildId: '', }; - await this.core.apis.FileApi.addFileCache( - { - peerUid: msg.peerUid, - chatType: msg.chatType, - guildId: '', - }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - elementWrapper.elementId, - elementWrapper.elementType.toString(), - element.fileSize || '0', - element.fileUuid || '', - ); return { type: OB11MessageDataType.voice, data: { diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index 5206028b..e28e8b91 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) { SettingItem( 'Napcat', undefined, - SettingButton('V2.3.0', 'napcat-update-button', 'secondary'), + SettingButton('V2.3.2', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 820815dd..0055edc6 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.3.0", "napcat-update-button", "secondary") + SettingButton("V2.3.2", "napcat-update-button", "secondary") ) ]), SettingList([ From 21061561ec2b7caa6f2ba6f6fb0659b50f9a92e0 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?= Date: Thu, 5 Sep 2024 15:06:11 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/api/msg.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index abf9e3e5..bd36e2fa 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -677,8 +677,10 @@ export class OneBotMsgApi { if (ret.result === 0) { resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode); resMsg.sender.nickname = ret.tmpChatInfo!.fromNick; + resMsg.temp_source = resMsg.group_id; } else { resMsg.group_id = 284840486; //兜底数据 + resMsg.temp_source = resMsg.group_id; resMsg.sender.nickname = '临时会话'; } } From 522311b54745dd95ce89d2c83c98596e0effe096 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?= Date: Thu, 5 Sep 2024 16:00:13 +0800 Subject: [PATCH 7/9] release: 2.3.4 --- launcher/NapCatWinBootHook.dll | Bin 11264 -> 11264 bytes launcher/NapCatWinBootMain.exe | Bin 22016 -> 22528 bytes manifest.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- src/webui/ui/NapCat.ts | 2 +- static/assets/renderer.js | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/launcher/NapCatWinBootHook.dll b/launcher/NapCatWinBootHook.dll index 4f03788bc0e5c50ffb89fc47f7e5577a0622dd53..9dd29e749de43f85a901a91dc5d5d9cd648bdae5 100644 GIT binary patch delta 21 bcmZpOXo#5bgK0s^#$UT6fYjz~l3qdpaa{?Z delta 21 bcmZpOXo#5bgK3ug#$UT6fYjz~l3qdpZnz0r diff --git a/launcher/NapCatWinBootMain.exe b/launcher/NapCatWinBootMain.exe index be02e30ecb0b591758b832a80cef68221d226979..be509565c46e302ac9d6f3cf5062e59297c02f4e 100644 GIT binary patch delta 7240 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 SyL0!R-Pn%K?uzOI!v6td79-UF delta 7023 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', undefined, - SettingButton('V2.3.2', 'napcat-update-button', 'secondary'), + SettingButton('V2.3.4', 'napcat-update-button', 'secondary'), ), ]), SettingList([ diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 0055edc6..690449da 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) { SettingItem( 'Napcat', void 0, - SettingButton("V2.3.2", "napcat-update-button", "secondary") + SettingButton("V2.3.4", "napcat-update-button", "secondary") ) ]), SettingList([ From 3019ef7de4ce010f924dc8983b4b05c2895e8dea 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?= Date: Thu, 5 Sep 2024 16:15:21 +0800 Subject: [PATCH 8/9] release: 2.3.4 --- launcher/NapCatWinBootHook.dll | Bin 11264 -> 11264 bytes launcher/NapCatWinBootMain.exe | Bin 22528 -> 22528 bytes launcher/launcher-win10.bat | 4 +++- launcher/launcher.bat | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/launcher/NapCatWinBootHook.dll b/launcher/NapCatWinBootHook.dll index 9dd29e749de43f85a901a91dc5d5d9cd648bdae5..cd6ff3464883df9f8117133e1dc1c4a1ec8b7c3c 100644 GIT binary patch delta 21 bcmZpOXo#5bgDD_=rwAW(AwS{`EQA|jwe5G>prmc%Mhc zPZ*|92Tu-3qVKm9g=FbyfG-*J6IJ*VVX5>x{!-Wo^Z0l|O6C0}^0y`O*MZD<{(0Ca z>qp^)^rk3M{YXMOnS3H}A@0v!r&~;e2T{s+?2yv9z9EFTe3K~ihLp%Bn0L9E$sNo) z#}asouNg9f{?1PfxtH$Y(ZnHXKkWc{9Lh?~2gd7ZYh68R>RuQIudPmdVG*GD7|zaKSE zw=j7h8@ZQxZqlXk%vXdNO@zLUdHPJx1u;2@e-mMM9||0}p(sVIW>Kh58a-Updnl0n zyP`0U+f1HY#^gJ~1usoOxZpd(wFie7oTh5O3kA$Qf}FxmJ`GMs%9{(N z4n>lMO*Xy`_uQk3^okXu4k?mLgu;)><)O@{PvCDyO`y^IWYj$O&Ll$C`D;TJNdecJ z=JGjhl}w&ttIqvWk+^0xDAEt$MBUYjv;nNMV3n=1_HN{6HZ|pTqzcUYuUgJW*F{@V z&O9iw$$F4pkMV?OE0P&{#CiUfqU;n6Rix|M3>OHEPStcnQzV}$ zUU%KJ;Vo#Ge9M&NAoER0YayxQe?k&WeV7$>{QI(^$j8(YE~s^PAVDV_0&TD`IR>Uc zt6<$ei4IiT3Rk6#`P`vJ_e;_$&J-;GJ zbS5`Mk1YEi+Pcw&edDWG&wQmUu&Yn(PAxxjwIm|qbC;0USHYNPb)|`!CRZ?*Ts%um zv{Tz8jn_nBSe4m)O>`N3njeiWs!mQ&mp>iB4BFoL5t_i(iz1lR`*Z)0tx)#Zv3N{& z+Lkb{eoLv^^sDGL3iv>bS%fiiMV*@BFHm6o2Lt1u;45S9q6>Hvu#+E&k=)~OLl)=y zbB~HmwM3C_;V#^z;HQo!unNNpMY{BdL3KO_x!VA0H)uvP`Oo-WNHPICwr4mZLGY1bEXTfBpA zQ-pKFw1_W`DN5}MHrIF)44S`#Tdc1|9V`(s(B(GA zbTrpmSNJ*KW6iK^f*xD8t2QL?f&urZiQ(Sy8P{@}JaNkU`!HyC&ek)T@8HR21rf&ajQ>4CWT+2_74*GvN?g4uRp_L;&qwF zU$xmRb2Q_uJB;Zt#_@n{mZ^7wIHXtZRZOg1e{2GOz@9HXR4lI84(jykr-JPbamqMh zo9#JSkr3PUPK*&d)af-Afi>;=aj41js;0<*VmFqJcoXdWH+$x^8-+OQ9ii>|^I(F6 zLEjCo=z5#ACg0OxZP$MVQLh>ffop}=VQ1$XBN2rQZi1F;VTud@ozkuAUj^6-8(UhVG=E+5m*Hl?cAAfR@wQT9)xmC-SWf8t5>n-YUDac+)qr? z19SHehYEiluH+IDDS9D(@M*@UMOIDKiW=K9i-f8fb_eKy&Ngb47}Fx>t_i{)8e?9} z!vUnoz&l?(7HB*`7k(HjT@6Z(jWduTW1`5APePZ3R2s^Hk#;s*rXgf{6`17!L--O@ zn9+dycjFj=>kP*YdxC;1_=|ZdNU|l*7NJHA4mKPS@gwTYWB7@@yLG|Cd1QWuZnd5} z@;gO21xY%XvI?f!`$P%I@@pC)x6-lIkV4R$5jf)jRpwg?k|g0NI*^U_?F3wa=gyXI z3;rHStN9jJ6o17vROPaPkGRq_ZOf3-N}an1A88JhR0diPD088;pcQEIHRwgV8vsJT z4KxVzcRoOf=z|B~0^b1o8K4@xSe9OZ@W<{VTT#8>vBL;<9a#uo(62P!O%8)`VLA&j zSkT7=52rfN2EaV<+dxkPL?A&w#-4c({>`At*f$@7w}Czi5MwJrH}&(ILDMp{vFV_G zK&vPev^&GC8M+}DGd11}I;Ed?fzAbppz}b@S%jPwg@P^s2>mOd$Fnh8=ud-Yj?(lF z(7yp@!Dln*seWG2p`$hZ&~h+-EZ=V!j6+QJ0nBAc0(u@`0WWs{{eX+5gou6iCZGERsCHY0&YO@M(#`v6YS0jdhLd8*et6n=DNYO|4D-rjDk=O{ZFlAKXp< E4`Y2LMF0Q* delta 4079 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 {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH% -"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" \ No newline at end of file +"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" + +REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456 \ No newline at end of file diff --git a/launcher/launcher.bat b/launcher/launcher.bat index 84be339a..d3124507 100644 --- a/launcher/launcher.bat +++ b/launcher/launcher.bat @@ -37,3 +37,5 @@ set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/% echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > %NAPCAT_LOAD_PATH% "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" + +REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456 \ No newline at end of file From 8eca26b1a534a6d09fbfffc95d3273bc273194dd 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?= Date: Thu, 5 Sep 2024 18:03:32 +0800 Subject: [PATCH 9/9] fix --- src/onebot/types/message.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts index 2a340bab..3ed30119 100644 --- a/src/onebot/types/message.ts +++ b/src/onebot/types/message.ts @@ -8,6 +8,7 @@ export enum OB11MessageType { } export interface OB11Message { + temp_source?: number; message_sent_type?: string; target_id?: number; // 自己发送的消息才有此字段 self_id?: number,