release: 2.2.37

This reverts commit 309d8a9f18.

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "",
+  "version": "2.2.37",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '';
+export const napCatVersion = '2.2.37';

src/onebot/action/file/GetFile.ts

@@ -3,6 +3,7 @@ import fs from 'fs/promises';
 import { FileNapCatOneBotUUID } from '@/common/helper';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types';
 
 export interface GetFilePayload {
     file: string; // 文件名或者fileUuid
@@ -33,16 +34,27 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
         if (contextMsgFile) {
             const { peer, msgId, elementId } = contextMsgFile;
             const downloadPath = await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
-            const mixElement = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
-                .find(msg => msg.msgId === msgId)?.elements.find(e => e.elementId === elementId);
+            const rawMessage = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
+                .find(msg => msg.msgId === msgId);
+            const mixElement = rawMessage?.elements.find(e => e.elementId === elementId);
             const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
             if (!mixElementInner) throw new Error('element not found');
             const fileSize = mixElementInner.fileSize?.toString() ?? '';
             const fileName = mixElementInner.fileName ?? '';
-
+            let url = '';
+            if (mixElement?.picElement && rawMessage) {
+                let tempData =
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement) as OB11MessageImage | undefined;
+                url = tempData?.data.url ?? '';
+            }
+            if (mixElement?.videoElement && rawMessage) {
+                let tempData =
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement) as OB11MessageVideo | undefined;
+                url = tempData?.data.url ?? '';
+            }
             const res: GetFileResponse = {
                 file: downloadPath,
-                url: downloadPath,
+                url: url !== '' ? url : downloadPath,
                 file_size: fileSize,
                 file_name: fileName,
             };

src/onebot/action/msg/DeleteMsg.ts

@@ -28,18 +28,14 @@ class DeleteMsg extends BaseAction<Payload, void> {
             const ret = this.core.eventWrapper.registerListen(
                 'NodeIKernelMsgListener/onMsgInfoListUpdate',
                 1,
-                5000,
+                1000,
                 (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0'),
-            ).catch(() => new Promise<undefined>((resolve) => {
-                resolve(undefined);
-            }));
+            ).catch(() => undefined);
             await this.core.apis.MsgApi.recallMsg(msg.Peer, [msg.MsgId]);
             const data = await ret;
-            if (!data) {
-                //throw new Error('Recall failed');
-            }
-            //await sleep(100);
-            //await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId]);
+            if (!data) throw new Error('Recall failed');
+        } else {
+            throw new Error('Recall failed');
         }
     }
 }

src/onebot/entities.ts

@@ -24,7 +24,7 @@ export class OB11Entities {
             ...rawFriend.coreInfo,
             user_id: parseInt(rawFriend.coreInfo.uin),
             nickname: rawFriend.coreInfo.nick,
-            remark: rawFriend.coreInfo.nick,
+            remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick,
             sex: this.sex(rawFriend.baseInfo.sex!),
             level: 0,
         }));

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.2.37', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V", "napcat-update-button", "secondary")
+          SettingButton("V2.2.37", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([