Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.17",
+  "version": "4.1.9",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.17",
+  "version": "4.1.9",
   "scripts": {
     "build:framework": "npm run build:webui && vite build --mode framework",
     "build:shell": "npm run build:webui && vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.17';
+export const napCatVersion = '4.1.9';

src/core/apis/file.ts

@@ -107,7 +107,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
         const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');

src/onebot/api/msg.ts

@@ -867,9 +867,11 @@ export class OneBotMsgApi {
             guildId: '',
             peerUid: peer.peerUid,
         }, returnMsg.msgId);
-        deleteAfterSentFiles.forEach(file => {
-            fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e));
-        });
+        setTimeout(() => {
+            deleteAfterSentFiles.forEach(file => {
+                fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError.bind(this.core.context.logger)('发送消息删除文件失败', e));
+            });
+        }, 60000);
         return returnMsg;
     }
 

src/onebot/config/config.ts

@@ -149,6 +149,9 @@ export function mergeOneBotConfigs(
     if (userConfig.musicSignUrl !== undefined) {
         mergedConfig.musicSignUrl = userConfig.musicSignUrl;
     }
+    if(userConfig.enableLocalFile2Url !== undefined) {
+        mergedConfig.enableLocalFile2Url = userConfig.enableLocalFile2Url;
+    }
     return mergedConfig;
 }