release: 2.0.26

manifest.json

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

package.json

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

src/common/framework/napcat.ts

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.0.24';
+export const napcat_version = '2.0.26';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/common/utils/file.ts

@@ -232,14 +232,21 @@ export async function uri2local(dir: string, uri: string, filename: string | und
     //接下来都要有文件名
     if (!filename) filename = randomUUID();
     //解析Http和Https协议
+    
     if (UriType == FileUriType.Remote) {
+        const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
+        if (pathInfo.name) {
+            filename = pathInfo.name;
+          if (pathInfo.ext) {
+            filename += pathInfo.ext;
+          }
+        }
+        filename = filename.replace(/[/\\:*?"<>|]/g, '_');
         const fileExt = path.extname(HandledUri);
-
-        const fileName = filename + fileExt;
-        const filePath = path.join(dir, fileName);
+        const filePath = path.join(dir, filename);
         const buffer = await httpDownload(HandledUri);
         fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: fileName, ext: fileExt, path: filePath, isLocal: true };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
     }
     //解析Base64
     if (UriType == FileUriType.Base64) {

src/core/apis/msg.ts

@@ -93,7 +93,22 @@ export class NTQQMsgApi {
     async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
         return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
     }
-
+    async getMsgExBySeq(peer: Peer, msgSeq: string) {
+        const DateNow = Math.floor(Date.now() / 1000);
+        const filterMsgFromTime = (DateNow - 300).toString();
+        const filterMsgToTime = DateNow.toString();
+        const ret = await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
+            filterMsgType: [],
+            filterSendersUid: [],
+            filterMsgToTime: filterMsgToTime,
+            filterMsgFromTime: filterMsgFromTime,
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 100,
+        });
+        return ret;
+    }
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }
@@ -102,18 +117,18 @@ export class NTQQMsgApi {
         const data = await this.core.eventWrapper.CallNormalEvent<
             (GroupCode: string, params: GetFileListParam) => Promise<unknown>,
             (groupFileListResult: onGroupFileInfoUpdateParamType) => void
-                >(
-                'NodeIKernelRichMediaService/getGroupFileList',
-                'NodeIKernelMsgListener/onGroupFileInfoUpdate',
-                1,
-                5000,
-                (groupFileListResult: onGroupFileInfoUpdateParamType) => {
+        >(
+            'NodeIKernelRichMediaService/getGroupFileList',
+            'NodeIKernelMsgListener/onGroupFileInfoUpdate',
+            1,
+            5000,
+            (groupFileListResult: onGroupFileInfoUpdateParamType) => {
                 //Developer Mlikiowa Todo: 此处有问题 无法判断是否成功
-                    return true;
-                },
-                GroupCode,
-                params,
-                );
+                return true;
+            },
+            GroupCode,
+            params,
+        );
         return data[1].item;
     }
 
@@ -164,24 +179,24 @@ export class NTQQMsgApi {
         const data = await this.core.eventWrapper.CallNormalEvent<
             (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
             (msgList: RawMessage[]) => void
-                >(
-                'NodeIKernelMsgService/sendMsg',
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                timeout,
-                (msgRecords: RawMessage[]) => {
-                    for (const msgRecord of msgRecords) {
-                        if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
-                            return true;
-                        }
+        >(
+            'NodeIKernelMsgService/sendMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            1,
+            timeout,
+            (msgRecords: RawMessage[]) => {
+                for (const msgRecord of msgRecords) {
+                    if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {
+                        return true;
                     }
-                    return false;
-                },
-                '0',
-                peer,
-                msgElements,
-                new Map(),
-                );
+                }
+                return false;
+            },
+            '0',
+            peer,
+            msgElements,
+            new Map(),
+        );
         const retMsg = data[1].find(msgRecord => {
             if (msgRecord.guildId === msgId) {
                 return true;
@@ -209,25 +224,25 @@ export class NTQQMsgApi {
         const data = await this.core.eventWrapper.CallNormalEvent<
             (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>) => Promise<unknown>,
             (msgList: RawMessage[]) => void
-                >(
-                'NodeIKernelMsgService/multiForwardMsgWithComment',
-                'NodeIKernelMsgListener/onMsgInfoListUpdate',
-                1,
-                5000,
-                (msgRecords: RawMessage[]) => {
-                    for (const msgRecord of msgRecords) {
-                        if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
-                            return true;
-                        }
+        >(
+            'NodeIKernelMsgService/multiForwardMsgWithComment',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            1,
+            5000,
+            (msgRecords: RawMessage[]) => {
+                for (const msgRecord of msgRecords) {
+                    if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == this.core.selfInfo.uid) {
+                        return true;
                     }
-                    return false;
-                },
-                msgInfos,
-                srcPeer,
-                destPeer,
-                [],
-                new Map(),
-                );
+                }
+                return false;
+            },
+            msgInfos,
+            srcPeer,
+            destPeer,
+            [],
+            new Map(),
+        );
         for (const msg of data[1]) {
             const arkElement = msg.elements.find(ele => ele.arkElement);
             if (!arkElement) {

src/onebot/action/msg/SendMsg/create-send-elements.ts

@@ -56,7 +56,7 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.24 Refactor Todo
+        // Mlikiowa V2.0.26 Refactor Todo
         const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`);
         if (!uid) throw new Error('Get Uid Error');
         return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
         } else {
             postData = data;
         }
-        // Mlikiowa V2.0.24 Refactor Todo
+        // Mlikiowa V2.0.26 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/helper/data.ts

@@ -417,7 +417,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.24 Refactor Todo
+        // Mlikiowa V2.0.26 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {
@@ -530,13 +530,18 @@ export class OB11Constructor {
                         const senderUin = emojiLikeData.gtip.qq.jp;
                         const msgSeq = emojiLikeData.gtip.url.msgseq;
                         const emojiId = emojiLikeData.gtip.face.id;
-
-                        const replyMsgList = (await NTQQMsgApi.getMsgsBySeqAndCount({
+                        const peer = {
                             chatType: ChatType.group,
                             guildId: '',
-                            peerUid: msg.peerUid,
-                        }, msgSeq, 1, true, true)).msgList;
-                        console.log("表情回应消息长度检测", replyMsgList.length)
+                            peerUid: msg.peerUid
+                        }
+                        // const replyMsgList = (await NTQQMsgApi.getMsgsBySeqAndCount({
+                        //     chatType: ChatType.group,
+                        //     guildId: '',
+                        //     peerUid: msg.peerUid,
+                        // }, msgSeq, 1, true, true)).msgList;
+                        const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, msgSeq)).msgList;
+                        //console.log("表情回应消息长度检测", replyMsgList.length)
                         if (replyMsgList.length < 1) {
                             return;
                         }

src/webui/ui/NapCat.ts

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