Update appid.json

README.md

@@ -1,9 +1,8 @@
-<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">
 
 # NapCat
 
-
+![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
 
 _Modern protocol-side framework implemented based on NTQQ._
 
@@ -51,10 +50,6 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-+ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
-
-+ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
-  
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
@@ -66,3 +61,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
 **本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+
+## Warnings
+
+[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.19-34740",
-  "verHash": "f31348f2",
-  "linuxVersion": "3.2.17-34740",
-  "linuxVerHash": "5aa2d8d6",
+  "version": "9.9.18-32869",
+  "verHash": "e735296c",
+  "linuxVersion": "3.2.16-32869",
+  "linuxVerHash": "4c192ba9",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -16,10 +16,27 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "34740",
+  "peerDependenciesMeta": {
+    "*": {
+      "optional": true
+    }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
+      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
+      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
+    }
+  },
+  "buildVersion": "32869",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.63",
+  "version": "4.7.45",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -35,6 +35,7 @@
     "@types/qrcode-terminal": "^0.12.2",
     "@types/react-color": "^3.0.13",
     "@types/type-is": "^1.6.7",
+    "@types/wordcloud": "^1.2.2",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
@@ -42,7 +43,7 @@
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
     "cors": "^2.8.5",
-    "esbuild": "0.25.4",
+    "esbuild": "0.25.0",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
@@ -50,6 +51,7 @@
     "fast-xml-parser": "^4.3.6",
     "file-type": "^20.0.0",
     "globals": "^16.0.0",
+    "image-size": "^1.1.1",
     "json5": "^2.2.3",
     "multer": "^1.4.5-lts.1",
     "typescript": "^5.3.3",
@@ -62,8 +64,12 @@
     "compressing": "^1.10.1"
   },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.67",
+    "@node-rs/jieba": "^2.0.1",
     "express": "^5.0.0",
+    "napcat.protobuf": "^1.1.2",
     "silk-wasm": "^3.6.1",
+    "wordcloud": "^1.2.3",
     "ws": "^8.18.0"
   }
 }

src/common/download-ffmpeg.ts

@@ -8,12 +8,11 @@ import { pipeline } from 'stream/promises';
 import { fileURLToPath } from 'url';
 import { LogWrapper } from './log';
 
-const downloadOri = 'https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip';
+const downloadOri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
 const urls = [
-    'https://github.moeyy.xyz/' + downloadOri,
-    'https://ghp.ci/' + downloadOri,
-    'https://gh.api.99988866.xyz/' + downloadOri,
-    'https://gh.api.99988866.xyz/' + downloadOri,
+    "https://github.moeyy.xyz/" + downloadOri,
+    "https://ghp.ci/" + downloadOri,
+    "https://gh.api.99988866.xyz/" + downloadOri,
     downloadOri
 ];
 
@@ -337,24 +336,17 @@ export async function downloadFFmpegIfNotExists(log: LogWrapper) {
     const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
 
     if (!ffmpeg_exist || !ffprobe_exist) {
-        let url = await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
+        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
             log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
         });
-        if (!url) {
-            log.log('[FFmpeg] [Error] 下载FFmpeg失败');
-            return {
-                path: null,
-                reset: false
-            };
-        }
         return {
             path: path.join(currentPath, 'ffmpeg'),
             reset: true
-        };
+        }
     }
 
     return {
         path: path.join(currentPath, 'ffmpeg'),
         reset: true
-    };
+    }
 }

src/common/ffmpeg.ts

@@ -4,10 +4,10 @@ import { execFile } from 'child_process';
 import { promisify } from 'util';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
 import { fileURLToPath } from 'node:url';
 import { platform } from 'node:os';
 import { LogWrapper } from './log';
-import { imageSizeFallBack } from '@/image-size';
 const currentPath = dirname(fileURLToPath(import.meta.url));
 const execFileAsync = promisify(execFile);
 const getFFmpegPath = (tool: string): string => {
@@ -157,7 +157,7 @@ export class FFmpegService {
         try {
             await this.extractThumbnail(videoPath, thumbnailPath);
             // 获取图片尺寸
-            const dimensions = await imageSizeFallBack(thumbnailPath);
+            const dimensions = imageSize(thumbnailPath);
 
             return {
                 format: fileType?.ext ?? 'mp4',

src/common/file.ts

@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-    case FileUriType.Local: {
-        const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-        const tempFilePath = path.join(dir, filename + fileExt);
-        fs.copyFileSync(HandledUri, tempFilePath);
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-    }
+        case FileUriType.Local: {
+            const fileExt = path.extname(HandledUri);
+            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+            const tempFilePath = path.join(dir, filename + fileExt);
+            fs.copyFileSync(HandledUri, tempFilePath);
+            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+        }
 
-    case FileUriType.Remote: {
-        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        case FileUriType.Remote: {
+            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+            fs.writeFileSync(filePath, buffer);
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
+        }
 
-    case FileUriType.Base64: {
-        const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        case FileUriType.Base64: {
+            const base64 = HandledUri.replace(/^base64:\/\//, '');
+            const base64Buffer = Buffer.from(base64, 'base64');
+            fs.writeFileSync(filePath, base64Buffer);
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
+        }
 
-    default:
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+        default:
+            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/message-unique.ts

@@ -1,4 +1,6 @@
 import { Peer } from '@/core';
+import crypto from 'crypto';
+
 export class LimitedHashTable<K, V> {
     private readonly keyToValue: Map<K, V> = new Map();
     private readonly valueToKey: Map<V, K> = new Map();
@@ -76,19 +78,65 @@ export class LimitedHashTable<K, V> {
 }
 
 class MessageUniqueWrapper {
-    constructor() {
+    private readonly msgDataMap: LimitedHashTable<string, number>;
+    private readonly msgIdMap: LimitedHashTable<string, number>;
+
+    constructor(maxMap: number = 5000) {
+        this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+        this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
     }
 
-    getOutputData(peer: Peer, msg_id: string, seq: string): string {
-        return `${peer.chatType}|${msg_id}|${peer.peerUid}|${seq}`;
-    }
-
-    getInnerData(shortId: string): { MsgId: string; Peer: Peer, seq: string } | undefined {
-        const [chatType, msgId, peerUid, seq] = shortId.split('|');
-        if (!chatType || !msgId || !peerUid || !seq) {
-            return undefined;
+    getRecentMsgIds(Peer: Peer, size: number): string[] {
+        const heads = this.msgIdMap.getHeads(size);
+        if (!heads) {
+            return [];
         }
-        return { MsgId: msgId, Peer: { chatType: parseInt(chatType), peerUid, guildId: '' }, seq: seq };
+        const data = heads.map((t) => MessageUnique.getMsgIdAndPeerByShortId(t.value));
+        const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid);
+        return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
+    }
+
+    createUniqueMsgId(peer: Peer, msgId: string) {
+        const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+        const hash = crypto.createHash('md5').update(key).digest();
+        if (hash[0]) {
+            //设置第一个bit为0 保证shortId为正数
+            hash[0] &= 0x7f;
+        }
+        const shortId = hash.readInt32BE(0);
+        //减少性能损耗
+        this.msgIdMap.set(msgId, shortId);
+        this.msgDataMap.set(key, shortId);
+        return shortId;
+    }
+
+    getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
+        const data = this.msgDataMap.getKey(shortId);
+        if (data) {
+            const [msgId, chatTypeStr, peerUid] = data.split('|');
+            const peer: Peer = {
+                chatType: parseInt(chatTypeStr ?? '0'),
+                peerUid: peerUid ?? '',
+                guildId: '',
+            };
+            return { MsgId: msgId ?? '0', Peer: peer };
+        }
+        return undefined;
+    }
+
+    getShortIdByMsgId(msgId: string): number | undefined {
+        return this.msgIdMap.getValue(msgId);
+    }
+
+    getPeerByMsgId(msgId: string) {
+        const shortId = this.msgIdMap.getValue(msgId);
+        if (!shortId) return undefined;
+        return this.getMsgIdAndPeerByShortId(shortId);
+    }
+
+    resize(maxSize: number): void {
+        this.msgIdMap.resize(maxSize);
+        this.msgDataMap.resize(maxSize);
     }
 }
 

src/common/request.ts

@@ -109,7 +109,6 @@ export class RequestUtil {
             req.end();
         });
     }
-
     // 请求返回都是原始内容
     static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
         return this.HttpGetJson<string>(url, method, data, headers, false, false);

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.63';
+export const napCatVersion = '4.7.45';

src/common/worker.ts

@@ -9,7 +9,7 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
                     console.error('Worker Log--->:', (result as { log: string }).log);
                 }
                 if ((result as any)?.error) {
-                    reject(new Error('Worker error: ' + (result as { error: string }).error));
+                    reject(new Error("Worker error: " + (result as { error: string }).error));
                 }
                 resolve(result);
             });

src/core/apis/file.ts

@@ -17,6 +17,8 @@ import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
+import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { RkeyManager } from '@/core/helper/rkey';
 import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
@@ -26,9 +28,6 @@ import { SendMessageContext } from '@/onebot/api';
 import { getFileTypeForSendType } from '../helper/msg';
 import { FFmpegService } from '@/common/ffmpeg';
 import { rkeyDataType } from '../types/file';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { FileId } from '../packet/transformer/proto/misc/fileid';
-import { imageSizeFallBack } from '@/image-size';
 
 export class NTQQFileApi {
     context: InstanceContext;
@@ -45,7 +44,7 @@ export class NTQQFileApi {
             'https://secret-service.bietiaop.com/rkeys',
             'http://ss.xingzhige.com/music_card/rkey',
         ],
-        this.context.logger
+            this.context.logger
         );
     }
 
@@ -64,76 +63,6 @@ export class NTQQFileApi {
         }
     }
 
-    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined) {
-        if (this.core.apis.PacketApi.available) {
-            try {
-                if (chatType === ChatType.KCHATTYPEGROUP && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+peer, fileUUID);
-                } else if (file10MMd5 && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5);
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('fileUUID or file10MMd5 is undefined');
-    }
-
-    async getPttUrl(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1403) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get ptt url');
-    }
-
-    async getVideoUrlPacket(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1415) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupVideoUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get video url');
-    }
 
     async copyFile(filePath: string, destPath: string) {
         await this.core.util.copyFile(filePath, destPath);
@@ -208,7 +137,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
-        const imageSize = await imageSizeFallBack(picPath);
+        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
         context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
@@ -379,24 +308,23 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                    case ElementType.PIC:
+                        case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.VIDEO:
+                            break;
+                        case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.PTT:
+                            break;
+                        case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
-                    case ElementType.FILE:
+                            break;
+                        case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
                     }
                     elementIndex++;
                 }
             });
         });
-        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -436,6 +364,19 @@ export class NTQQFileApi {
         return completeRetData.filePath;
     }
 
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
+        return new Promise((resolve, reject) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
+                if (err) {
+                    reject(new Error(err.message));
+                } else if (!dimensions) {
+                    reject(new Error('获取图片尺寸失败'));
+                } else {
+                    resolve(dimensions);
+                }
+            });
+        });
+    }
 
     async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
         const randomResultId = 100000 + Math.floor(Math.random() * 10000);

src/core/apis/friend.ts

@@ -110,7 +110,7 @@ export class NTQQFriendApi {
                 time: item.reqTime, // 信息字段
                 type: 'doubt' //保留字段
             };
-        }));
+        }))
         return requests;
     }
 }

src/core/apis/msg.ts

@@ -17,6 +17,24 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
     }
 
+    async searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }) {
+        let outputSearchId = 0;
+        return this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchMsgWithKeywords',
+            'NodeIKernelSearchListener/onSearchMsgKeywordsResult',
+            [keyWords, param],
+            (searchId) => {
+                outputSearchId = searchId;
+                return true;
+            },
+            (event) => {
+                return event.searchId == outputSearchId;
+            },
+            1,
+            5000
+        );
+    }
+
     getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
         // https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
         return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
@@ -71,7 +89,6 @@ export class NTQQMsgApi {
     async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
-            //searchFields: 3,
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
@@ -85,7 +102,6 @@ export class NTQQMsgApi {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
             filterMsgType: [],
-            //searchFields: 3,
             filterSendersUid: SendersUid,
             filterMsgToTime: MsgTime,
             filterMsgFromTime: MsgTime,
@@ -102,7 +118,6 @@ export class NTQQMsgApi {
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: false,
-            //searchFields: 3,
             isIncludeCurrent: true,
             pageLimit: 1,
         });
@@ -113,7 +128,6 @@ export class NTQQMsgApi {
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
-            //searchFields: 3,
             filterMsgFromTime: '0',
             isReverseOrder: true,
             isIncludeCurrent: true,
@@ -132,7 +146,6 @@ export class NTQQMsgApi {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
-            //searchFields: 3,
             filterMsgToTime: filterMsgToTime,
             filterMsgFromTime: filterMsgFromTime,
             isReverseOrder: false,
@@ -142,12 +155,10 @@ export class NTQQMsgApi {
     }
 
     async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
-        console.log(peer, SendersUid);
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
             chatInfo: peer,
             filterMsgType: [],
             filterSendersUid: SendersUid,
-            //searchFields: 3,
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: true,
@@ -155,7 +166,30 @@ export class NTQQMsgApi {
             pageLimit: 20000,
         });
     }
-
+    async queryFirstMsgBySenderTime(peer: Peer, SendersUid: string[], filterMsgFromTime: string, filterMsgToTime: string) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: filterMsgToTime,
+            filterMsgFromTime: filterMsgFromTime,
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+    async queryFirstMsgByTime(peer: Peer, filterMsgFromTime: string, filterMsgToTime: string) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: [],
+            filterMsgToTime: filterMsgToTime,
+            filterMsgFromTime: filterMsgFromTime,
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/external/appid.json

@@ -1,4 +1,76 @@
 {
+    "3.1.2-13107": {
+        "appid": 537146866,
+        "qua": "V1_LNX_NQ_3.1.2-13107_RDM_B"
+    },
+    "3.2.10-25765": {
+        "appid": 537234773,
+        "qua": "V1_LNX_NQ_3.2.10_25765_GW_B"
+    },
+    "3.2.12-26702": {
+        "appid": 537237950,
+        "qua": "V1_LNX_NQ_3.2.12_26702_GW_B"
+    },
+    "3.2.12-26740": {
+        "appid": 537237950,
+        "qua": "V1_LNX_NQ_3.2.12_26740_GW_B"
+    },
+    "3.2.12-26909": {
+        "appid": 537237923,
+        "qua": "V1_LNX_NQ_3.2.12_26909_GW_B"
+    },
+    "3.2.12-27187": {
+        "appid": 537240645,
+        "qua": "V1_LNX_NQ_3.2.12_27187_GW_B"
+    },
+    "3.2.12-27206": {
+        "appid": 537240645,
+        "qua": "V1_LNX_NQ_3.2.12_27206_GW_B"
+    },
+    "3.2.12-27254": {
+        "appid": 537240795,
+        "qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
+    },
+    "9.9.11-24815": {
+        "appid": 537226656,
+        "qua": "V1_WIN_NQ_9.9.11_24815_GW_B"
+    },
+    "9.9.12-25493": {
+        "appid": 537231759,
+        "qua": "V1_WIN_NQ_9.9.12_25493_GW_B"
+    },
+    "9.9.12-25765": {
+        "appid": 537234702,
+        "qua": "V1_WIN_NQ_9.9.12_25765_GW_B"
+    },
+    "9.9.12-26299": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26299_GW_B"
+    },
+    "9.9.12-26339": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26339_GW_B"
+    },
+    "9.9.12-26466": {
+        "appid": 537234826,
+        "qua": "V1_WIN_NQ_9.9.12_26466_GW_B"
+    },
+    "9.9.15-26702": {
+        "appid": 537237765,
+        "qua": "V1_WIN_NQ_9.9.15_26702_GW_B"
+    },
+    "9.9.15-26740": {
+        "appid": 537237765,
+        "qua": "V1_WIN_NQ_9.9.15_26740_GW_B"
+    },
+    "3.2.12-27556": {
+        "appid": 537243600,
+        "qua": "V1_LNX_NQ_3.2.12_27556_GW_B"
+    },
+    "3.2.12-27597": {
+        "appid": 537243600,
+        "qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
+    },
     "9.9.15-28060": {
         "appid": 537246092,
         "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
@@ -283,16 +355,212 @@
         "appid": 537290727,
         "qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
     },
-    "9.9.19-34958": {
-        "appid": 537290742,
-        "qua": "V1_WIN_NQ_9.9.19_34958_GW_B"
+    "8.9.50-Android": {
+        "appid": 537155551,
+        "qua": "V1_AND_SQ_8.9.50_3898_YYB_D"
     },
-    "3.2.17-35184": {
-        "appid": 537291084,
-        "qua": "V1_LNX_NQ_3.2.17_35184_GW_B"
+    "9.0.1-Watch": {
+        "appid": 537214131,
+        "qua": "V1_AND_SQ_8.9.68_0_RDM_B"
     },
-    "9.9.19-35184": {
-        "appid": 537291048,
-        "qua": "V1_WIN_NQ_9.9.19_35184_GW_B"
+    "6.8.2-21241": {
+        "appid": 537128930,
+        "qua": "V1_IOS_SQ_6.8.2_21241_YYB_D"
+    },
+    "8.8.88-Android": {
+        "appid": 537118044,
+        "qua": "V1_IOS_SQ_8.8.88_2770_YYB_D"
+    },
+    "8.9.90-Android": {
+        "appid": 537185007,
+        "qua": "V1_AND_SQ_8.9.90_4938_YYB_D"
+    },
+    "8.9.33-Android": {
+        "appid": 537151682,
+        "qua": "V1_AND_SQ_8.9.33_3898_YYB_D"
+    },
+    "3.5.1-Tim": {
+        "appid": 537150355,
+        "qua": "V1_AND_SQ_8.3.9_351_TIM_D"
+    },
+    "8.9.58-Android": {
+        "appid": 537163194,
+        "qua": "V1_AND_SQ_8.9.58_4108_YYB_D"
+    },
+    "8.9.63-Android": {
+        "appid": 537163194,
+        "qua": "V1_AND_SQ_8.9.63_4194_YYB_D"
+    },
+    "8.9.68-Android": {
+        "appid": 537168313,
+        "qua": "V1_AND_SQ_8.9.68_4264_YYB_D"
+    },
+    "8.9.70-Android": {
+        "appid": 537169928,
+        "qua": "V1_AND_SQ_8.9.70_4330_YYB_D"
+    },
+    "8.9.71-Android": {
+        "appid": 537170024,
+        "qua": "V1_AND_SQ_8.9.71_4332_YYB_D"
+    },
+    "8.9.73-Android": {
+        "appid": 537171689,
+        "qua": "V1_AND_SQ_8.9.73_4416_YYB_D"
+    },
+    "8.9.75-Android": {
+        "appid": 537173381,
+        "qua": "V1_AND_SQ_8.9.75_4482_YYB_D"
+    },
+    "8.9.76-Android": {
+        "appid": 537173477,
+        "qua": "V1_AND_SQ_8.9.76_4484_YYB_D"
+    },
+    "8.9.78-Android": {
+        "appid": 537175315,
+        "qua": "V1_AND_SQ_8.9.78_4548_YYB_D"
+    },
+    "8.9.80-Android": {
+        "appid": 537176863,
+        "qua": "V1_AND_SQ_8.9.80_4614_YYB_D"
+    },
+    "8.9.83-Android": {
+        "appid": 537178646,
+        "qua": "V1_AND_SQ_8.9.83_4680_YYB_D"
+    },
+    "8.9.85-Android": {
+        "appid": 537180568,
+        "qua": "V1_AND_SQ_8.9.85_4766_YYB_D"
+    },
+    "8.9.88-Android": {
+        "appid": 537182769,
+        "qua": "V1_AND_SQ_8.9.88_4852_YYB_D"
+    },
+    "8.9.93-Android": {
+        "appid": 537187398,
+        "qua": "V1_AND_SQ_8.9.93_5028_YYB_D"
+    },
+    "9.0.0-Android": {
+        "appid": 537194351,
+        "qua": "V1_AND_SQ_9.0.0_5282_YYB_D"
+    },
+    "9.0.8-Android": {
+        "appid": 537200218,
+        "qua": "V1_AND_SQ_9.0.8_5540_YYB_D"
+    },
+    "9.0.17-Android": {
+        "appid": 537204056,
+        "qua": "V1_AND_SQ_9.0.17_5712_YYB_D"
+    },
+    "9.0.25-Android": {
+        "appid": 537210084,
+        "qua": "V1_AND_SQ_9.0.25_5942_YYB_D"
+    },
+    "9.0.35-Android": {
+        "appid": 537215475,
+        "qua": "V1_AND_SQ_9.0.35_6150_YYB_D"
+    },
+    "9.0.50-Android": {
+        "appid": 537217916,
+        "qua": "V1_AND_SQ_9.0.50_6258_YYB_D"
+    },
+    "9.0.56-Android": {
+        "appid": 537220323,
+        "qua": "V1_AND_SQ_9.0.56_6372_YYB_D"
+    },
+    "9.0.60-Android": {
+        "appid": 537222797,
+        "qua": "V1_AND_SQ_9.0.60_6478_YYB_D"
+    },
+    "9.0.65-Android": {
+        "appid": 537225139,
+        "qua": "V1_AND_SQ_9.0.65_6588_YYB_D"
+    },
+    "9.0.70-Android": {
+        "appid": 537228487,
+        "qua": "V1_AND_SQ_9.0.70_6698_YYB_D"
+    },
+    "9.0.81-Android": {
+        "appid": 537233527,
+        "qua": "V1_AND_SQ_9.0.81_6922_YYB_D"
+    },
+    "9.0.85-Android": {
+        "appid": 537236316,
+        "qua": "V1_AND_SQ_9.0.85_7068_YYB_D"
+    },
+    "9.0.90-Android":{
+        "appid": 537239255,
+        "qua": "V1_AND_SQ_9.0.90_7218_YYB_D"
+    },
+    "9.0.95-Android": {
+        "appid": 537242075,
+        "qua": "V1_AND_SQ_9.0.95_7368_YYB_D"
+    },
+    "9.1.0-Android": {
+        "appid": 537244893,
+        "qua": "V1_AND_SQ_9.1.0_7518_YYB_D"
+    },
+    "9.1.20-Android": {
+        "appid": 537257414,
+        "qua": "V1_AND_SQ_9.1.20_8198_YYB_D"
+    },
+    "9.1.25-Android": {
+        "appid": 537260030,
+        "qua": "V1_AND_SQ_9.1.25_8368_YYB_D"
+    },
+    "9.1.67-Android": {
+        "appid": 537284101,
+        "qua": "V1_AND_SQ_9.1.67_9728_YYB_D"
+    },
+    "9.1.70-Android": {
+        "appid": 537285947,
+        "qua": "V1_AND_SQ_9.1.70_9898_YYB_D"
+    },
+    "9.1.65-Android": {
+        "appid": 537278302,
+        "qua": "V1_AND_SQ_9.1.65_9558_YYB_D"
+    },
+    "9.1.60-Android": {
+        "appid": 537275636,
+        "qua": "V1_AND_SQ_9.1.60_9388_YYB_D"
+    },
+    "9.1.55-Android": {
+        "appid": 537272835,
+        "qua": "V1_AND_SQ_9.1.55_9218_YYB_D"
+    },
+    "9.1.52-Android": {
+        "appid": 537270265,
+        "qua": "V1_AND_SQ_9.1.52_9054_YYB_D"
+    },
+    "9.1.50-Android": {
+        "appid": 537270031,
+        "qua": "V1_AND_SQ_9.1.50_9048_YYB_D"
+    },
+    "9.1.5-Android": {
+        "appid": 537247779,
+        "qua": "V1_AND_SQ_9.1.5_7688_YYB_D"
+    },
+    "9.1.35-Android": {
+        "appid": 537265576,
+        "qua": "V1_AND_SQ_9.1.35_8708_YYB_D"
+    },
+    "9.1.31-Android": {
+        "appid": 537262715,
+        "qua": "V1_AND_SQ_9.1.31_8542_YYB_D"
+    },
+    "9.1.30-Android": {
+        "appid": 537262559,
+        "qua": "V1_AND_SQ_9.1.30_8538_YYB_D"
+    },
+    "9.1.16-Android": {
+        "appid": 537254305,
+        "qua": "V1_AND_SQ_9.1.16_8032_YYB_D"
+    },
+    "9.1.15-Android": {
+        "appid": 537254149,
+        "qua": "V1_AND_SQ_9.1.15_8028_YYB_D"
+    },
+    "9.1.10-Android": {
+        "appid": 537251380,
+        "qua": "V1_AND_SQ_9.1.10_7858_YYB_D"
     }
 }

src/core/external/offset.json

@@ -354,29 +354,5 @@
     "9.9.19-34740-x64": {
         "send": "3BDD8D0",
         "recv": "3BE20D0"
-    },
-    "3.2.17-34740-x64": {
-        "send": "ADDF0A0",
-        "recv": "ADE2AC0"
-    },
-    "3.2.17-34740-arm64": {
-        "send": "7753BB8",
-        "recv": "77574E8"
-    },
-    "9.9.19-34958-x64": {
-        "send": "3BDD8D0",
-        "recv": "3BE20D0"
-    },
-    "3.2.17-35184-x64": {
-        "send": "AE0DDE0",
-        "recv": "AE11800"
-    },
-    "3.2.17-35184-arm64": {
-        "send": "7776028",
-        "recv": "7779958"
-    },
-    "9.9.19-35184-x64": {
-        "send": "3BE5A10",
-        "recv": "3BEA210"
     }
 }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(_arg: unknown): any {
+    onBuddyListChangedV2(arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(_arg: unknown): any {
+    onAddBuddyNeedVerify(arg: unknown): any {
     }
 
-    onAddMeSettingChanged(_arg: unknown): any {
+    onAddMeSettingChanged(arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(_arg: unknown): any {
+    onAvatarUrlUpdated(arg: unknown): any {
     }
 
-    onBlockChanged(_arg: unknown): any {
+    onBlockChanged(arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(_arg: unknown): any {
+    onBuddyDetailInfoChange(arg: unknown): any {
     }
 
-    onBuddyInfoChange(_arg: unknown): any {
+    onBuddyInfoChange(arg: unknown): any {
     }
 
-    onBuddyListChange(_arg: OnBuddyChangeParams): any {
+    onBuddyListChange(arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(_arg: unknown): any {
+    onBuddyRemarkUpdated(arg: unknown): any {
     }
 
-    onBuddyReqChange(_arg: FriendRequestNotify): any {
+    onBuddyReqChange(arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(_arg: unknown): any {
+    onBuddyReqUnreadCntChange(arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(_arg: unknown): any {
+    onCheckBuddySettingResult(arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(_arg: unknown): any {
+    onDelBatchBuddyInfos(arg: unknown): any {
         console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
     onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
     }
 
-    onNickUpdated(_arg: unknown): any {
+    onNickUpdated(arg: unknown): any {
     }
 
-    onSmartInfos(_arg: unknown): any {
+    onSmartInfos(arg: unknown): any {
     }
 
-    onSpacePermissionInfos(_arg: unknown): any {
+    onSpacePermissionInfos(arg: unknown): any {
     }
 }

src/core/listeners/NodeIKernelSearchListener.ts

@@ -96,7 +96,7 @@ export interface NodeIKernelSearchListener {
     }): any;
 
     onSearchMsgKeywordsResult(params: {
-        searchId: string,
+        searchId: number,
         hasMore: boolean,
         resultItems: Array<{
             msgId: string,

src/core/packet/client/nativeClient.ts

@@ -8,7 +8,8 @@ import { LRUCache } from '@/common/lru-cache';
 import { LogStack } from '@/core/packet/context/clientContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
-
+import { ProtoBufDecode } from 'napcat.protobuf';
+export const MsgData = new LRUCache<string, string>(5000);
 // 0 send 1 recv
 export interface NativePacketExportType {
     InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
@@ -56,6 +57,19 @@ export class NativePacketClient extends IPacketClient {
                 // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
+            if (cmd === 'trpc.msg.olpush.OlPushService.MsgPush') {
+                try {
+                    let msg_info = ProtoBufDecode(Buffer.from(hex_data, 'hex')) as any;
+                    let group_id = (msg_info['1']['1']['8']['1'] as number).toString()
+                    let msg_seq = (msg_info['1']['2']['5'] as number).toString()
+                    let msg_id = group_id + '_' + msg_seq;
+                    MsgData.put(msg_id, hex_data);
+                    console.log('add msgid:', msg_id);
+                } catch (error) {
+                    console.log('error:', error);
+                }
+
+            }
         }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }

src/core/packet/context/operationContext.ts

@@ -124,20 +124,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetPttUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadPtt.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetVideoUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadVideo.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadVideo.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
     async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
         const req = trans.DownloadGroupImage.build(groupUin, node);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -145,21 +131,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetGroupVideoUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupVideo.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -183,11 +154,11 @@ export class PacketOperationContext {
 
     private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
         const ps = msg.map((m) => {
-            return m.msg.map(async (e) => {
+            return m.msg.map(async(e) => {
                 if (e instanceof PacketMsgReplyElement && !e.targetElems) {
-                    this.context.logger.debug('Cannot find reply element\'s targetElems, prepare to fetch it...');
+                    this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
                     if (!e.targetPeer?.peerUid) {
-                        this.context.logger.error('targetPeer is undefined!');
+                        this.context.logger.error(`targetPeer is undefined!`);
                     }
                     let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
                     if (e.isGroupReply) {
@@ -200,7 +171,7 @@ export class PacketOperationContext {
                 }
             });
         }).flat();
-        await Promise.all(ps);
+        await Promise.all(ps)
         await this.UploadResources(msg, groupUin);
     }
 
@@ -208,14 +179,14 @@ export class PacketOperationContext {
         const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.FetchGroupMessage.parse(resp);
-        return res.body.messages;
+        return res.body.messages
     }
 
     async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
         const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.FetchC2CMessage.parse(resp);
-        return res.messages;
+        return res.messages
     }
 
     async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
@@ -251,7 +222,6 @@ export class PacketOperationContext {
         const res = trans.DownloadGroupFile.parse(resp);
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
-
     async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
         const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -259,6 +229,13 @@ export class PacketOperationContext {
         return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
     }
 
+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadGroupPtt.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
         const req = trans.GetMiniAppAdaptShareInfo.build(param);
         const resp = await this.context.client.sendOidbPacket(req, true);

src/core/packet/transformer/highway/DownloadGroupVideo.ts

@@ -1,50 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadGroupVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 2,
-                    group: {
-                        groupUin: groupUin
-                    }
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11EA, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadGroupVideo();

src/core/packet/transformer/highway/DownloadPtt.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadPtt extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 1,
-                    businessType: 3,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x126D, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadPtt();

src/core/packet/transformer/highway/DownloadVideo.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11E9, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadVideo();

src/core/packet/transformer/highway/index.ts

@@ -13,6 +13,3 @@ export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
 export { default as DownloadGroupImage } from './DownloadGroupImage';
-export { default as DownloadVideo } from './DownloadVideo';
-export { default as DownloadGroupVideo } from './DownloadGroupVideo';
-export { default as DownloadPtt } from './DownloadPtt';

src/core/packet/transformer/proto/misc/fileid.ts

@@ -1,6 +0,0 @@
-import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
-
-export const FileId = {
-    appid: ProtoField(4, ScalarType.UINT32, true),
-    ttl: ProtoField(10, ScalarType.UINT32, true),
-};

src/core/services/NodeIKernelGroupService.ts

@@ -249,7 +249,7 @@ export interface NodeIKernelGroupService {
 
     reqToJoinGroup(groupCode: string, arg: unknown): void;
 
-    setGroupShutUp(groupCode: string, shutUp: boolean): Promise<GeneralCallResult>;
+    setGroupShutUp(groupCode: string, shutUp: boolean): void;
 
     getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 

src/core/services/NodeIKernelMsgService.ts

@@ -148,11 +148,10 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
-    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
-    getMsgs(peer: Peer & { privilegeFlag: number }, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[]
-    }>;
+    //@deprecated
+    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
+    //@deprecated
     getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;

src/core/services/NodeIKernelSearchService.ts

@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
 
     cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
 
-    searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
+    searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): number;
 
     searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
 

src/core/types/msg.ts

@@ -477,7 +477,7 @@ export enum SendStatusType {
 export interface RawMessage {
     parentMsgPeer: Peer; // 父消息的Peer
     parentMsgIdList: string[];// 父消息 ID 列表
-    id?: string;// 扩展字段，与 Ob11 msg ID 有关
+    id?: number;// 扩展字段，与 Ob11 msg ID 有关
     guildId: string;// 频道ID
     msgRandom: string;// 消息ID相关
     msgId: string;// 雪花ID
@@ -508,8 +508,7 @@ export interface RawMessage {
  * 查询消息参数接口
  */
 export interface QueryMsgsParams {
-    chatInfo: Peer & { privilegeFlag?: number };
-    //searchFields: number;
+    chatInfo: Peer;
     filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;

src/core/types/notify.ts

@@ -132,26 +132,18 @@ export enum BuddyReqType {
     KMEINITIATORWAITPEERCONFIRM = 13
 }
 
-// 其中 ? 代表新版本参数
 export interface FriendRequest {
+    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
     reqTime: string;  // 时间戳 秒
-    flag?: number;  // 0
-    preGroupingId?: number;  // 0
-    commFriendNum?: number;  // 共同好友数
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
-    isDoubt?: boolean;  // 是否是可疑的好友请求
-    nameMore?: string;
     friendNick: string;
     sourceId: number;
-    groupCode: string;
-    isBuddy?: boolean;
-    isAgreed?: boolean;
-    relation?: number;
+    groupCode: string
 }
 
 export interface FriendRequestNotify {

src/image-size/index.ts

@@ -1,426 +0,0 @@
-import * as fs from 'fs';
-import { ReadStream } from 'fs';
-
-export interface ImageSize {
-    width: number;
-    height: number;
-}
-
-export enum ImageType {
-    JPEG = 'jpeg',
-    PNG = 'png',
-    BMP = 'bmp',
-    GIF = 'gif',
-    WEBP = 'webp',
-    UNKNOWN = 'unknown',
-}
-
-interface ImageParser {
-    readonly type: ImageType;
-    canParse(buffer: Buffer): boolean;
-    parseSize(stream: ReadStream): Promise<ImageSize | undefined>;
-}
-
-// 魔术匹配
-function matchMagic(buffer: Buffer, magic: number[], offset = 0): boolean {
-    if (buffer.length < offset + magic.length) {
-        return false;
-    }
-
-    for (let i = 0; i < magic.length; i++) {
-        if (buffer[offset + i] !== magic[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// PNG解析器
-class PngParser implements ImageParser {
-    readonly type = ImageType.PNG;
-    // PNG 魔术头：89 50 4E 47 0D 0A 1A 0A
-    private readonly PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.PNG_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(24) as Buffer;
-                if (!buf || buf.length < 24) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32BE(16);
-                    const height = buf.readUInt32BE(20);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// JPEG解析器
-class JpegParser implements ImageParser {
-    readonly type = ImageType.JPEG;
-    // JPEG 魔术头：FF D8
-    private readonly JPEG_SIGNATURE = [0xFF, 0xD8];
-
-    // JPEG标记常量
-    private readonly SOF_MARKERS = {
-        SOF0: 0xC0, // 基线DCT
-        SOF1: 0xC1, // 扩展顺序DCT
-        SOF2: 0xC2, // 渐进式DCT
-        SOF3: 0xC3, // 无损
-    } as const;
-
-    // 非SOF标记
-    private readonly NON_SOF_MARKERS: number[] = [
-        0xC4, // DHT
-        0xC8, // JPEG扩展
-        0xCC, // DAC
-    ] as const;
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.JPEG_SIGNATURE);
-    }
-
-    isSOFMarker(marker: number): boolean {
-        return (
-            marker === this.SOF_MARKERS.SOF0 ||
-            marker === this.SOF_MARKERS.SOF1 ||
-            marker === this.SOF_MARKERS.SOF2 ||
-            marker === this.SOF_MARKERS.SOF3
-        );
-    }
-
-    isNonSOFMarker(marker: number): boolean {
-        return this.NON_SOF_MARKERS.includes(marker);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise<ImageSize | undefined>((resolve, reject) => {
-            const BUFFER_SIZE = 1024; // 读取块大小，可以根据需要调整
-            let buffer = Buffer.alloc(0);
-            let offset = 0;
-            let found = false;
-
-            // 处理错误
-            stream.on('error', (err) => {
-                stream.destroy();
-                reject(err);
-            });
-
-            // 处理数据块
-            stream.on('data', (chunk: Buffer | string) => {
-                // 追加新数据到缓冲区
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer.subarray(offset), chunkBuffer]);
-                offset = 0;
-
-                // 保持缓冲区在合理大小内，只保留最后的部分用于跨块匹配
-                const bufferSize = buffer.length;
-                const MIN_REQUIRED_BYTES = 10; // SOF段最低字节数
-
-                // 从JPEG头部后开始扫描
-                while (offset < bufferSize - MIN_REQUIRED_BYTES) {
-                    // 寻找FF标记
-                    if (buffer[offset] === 0xFF && buffer[offset + 1]! >= 0xC0 && buffer[offset + 1]! <= 0xCF) {
-                        const marker = buffer[offset + 1];
-                        if (!marker) {
-                            break;
-                        }
-                        // 跳过非SOF标记
-                        if (this.isNonSOFMarker(marker)) {
-                            offset += 2;
-                            continue;
-                        }
-
-                        // 处理SOF标记 (包含尺寸信息)
-                        if (this.isSOFMarker(marker)) {
-                            // 确保缓冲区中有足够数据读取尺寸
-                            if (offset + 9 < bufferSize) {
-                                // 解析尺寸: FF XX YY YY PP HH HH WW WW ...
-                                // XX = 标记, YY YY = 段长度, PP = 精度, HH HH = 高, WW WW = 宽
-                                const height = buffer.readUInt16BE(offset + 5);
-                                const width = buffer.readUInt16BE(offset + 7);
-
-                                found = true;
-                                stream.destroy();
-                                resolve({ width, height });
-                                return;
-                            } else {
-                                // 如果缓冲区内数据不够，保留当前位置等待更多数据
-                                break;
-                            }
-                        }
-                    }
-
-                    offset++;
-                }
-
-                // 缓冲区管理: 如果处理了许多数据但没找到标记，
-                // 保留最后N字节用于跨块匹配，丢弃之前的数据
-                if (offset > BUFFER_SIZE) {
-                    const KEEP_BYTES = 20; // 保留足够数据以处理跨块边界的情况
-                    if (offset > KEEP_BYTES) {
-                        buffer = buffer.subarray(offset - KEEP_BYTES);
-                        offset = KEEP_BYTES;
-                    }
-                }
-            });
-
-            // 处理流结束
-            stream.on('end', () => {
-                if (!found) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// BMP解析器
-class BmpParser implements ImageParser {
-    readonly type = ImageType.BMP;
-    // BMP 魔术头：42 4D (BM)
-    private readonly BMP_SIGNATURE = [0x42, 0x4D];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.BMP_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(26) as Buffer;
-                if (!buf || buf.length < 26) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32LE(18);
-                    const height = buf.readUInt32LE(22);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// GIF解析器
-class GifParser implements ImageParser {
-    readonly type = ImageType.GIF;
-    // GIF87a 魔术头：47 49 46 38 37 61
-    private readonly GIF87A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x37, 0x61];
-    // GIF89a 魔术头：47 49 46 38 39 61
-    private readonly GIF89A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x39, 0x61];
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            matchMagic(buffer, this.GIF87A_SIGNATURE) ||
-            matchMagic(buffer, this.GIF89A_SIGNATURE)
-        );
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(10) as Buffer;
-                if (!buf || buf.length < 10) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt16LE(6);
-                    const height = buf.readUInt16LE(8);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// WEBP解析器 - 完整支持VP8, VP8L, VP8X格式
-class WebpParser implements ImageParser {
-    readonly type = ImageType.WEBP;
-    // WEBP RIFF 头：52 49 46 46 (RIFF)
-    private readonly RIFF_SIGNATURE = [0x52, 0x49, 0x46, 0x46];
-    // WEBP 魔术头：57 45 42 50 (WEBP)
-    private readonly WEBP_SIGNATURE = [0x57, 0x45, 0x42, 0x50];
-
-    // WEBP 块头
-    private readonly CHUNK_VP8 = [0x56, 0x50, 0x38, 0x20];  // "VP8 "
-    private readonly CHUNK_VP8L = [0x56, 0x50, 0x38, 0x4C]; // "VP8L"
-    private readonly CHUNK_VP8X = [0x56, 0x50, 0x38, 0x58]; // "VP8X"
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            buffer.length >= 12 &&
-            matchMagic(buffer, this.RIFF_SIGNATURE, 0) &&
-            matchMagic(buffer, this.WEBP_SIGNATURE, 8)
-        );
-    }
-
-    isChunkType(buffer: Buffer, offset: number, chunkType: number[]): boolean {
-        return buffer.length >= offset + 4 && matchMagic(buffer, chunkType, offset);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            // 需要读取足够的字节来检测所有三种格式
-            const MAX_HEADER_SIZE = 32;
-            let totalBytes = 0;
-            let buffer = Buffer.alloc(0);
-
-            stream.on('error', reject);
-
-            stream.on('data', (chunk: Buffer | string) => {
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer, chunkBuffer]);
-                totalBytes += chunk.length;
-
-                // 检查是否有足够的字节进行格式检测
-                if (totalBytes >= MAX_HEADER_SIZE) {
-                    stream.destroy();
-
-                    // 检查基本的WEBP签名
-                    if (!this.canParse(buffer)) {
-                        return resolve(undefined);
-                    }
-
-                    // 检查chunk头部，位于字节12-15
-                    if (this.isChunkType(buffer, 12, this.CHUNK_VP8)) {
-                        // VP8格式 - 标准WebP
-                        // 宽度和高度在帧头中
-                        const width = buffer.readUInt16LE(26) & 0x3FFF;
-                        const height = buffer.readUInt16LE(28) & 0x3FFF;
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8L)) {
-                        // VP8L格式 - 无损WebP
-                        // 1字节标记后是14位宽度和14位高度
-                        const bits = buffer.readUInt32LE(21);
-                        const width = 1 + (bits & 0x3FFF);
-                        const height = 1 + ((bits >> 14) & 0x3FFF);
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8X)) {
-                        // VP8X格式 - 扩展WebP
-                        // 24位宽度和高度(减去1)
-                        if (!buffer[24] || !buffer[25] || !buffer[26] || !buffer[27] || !buffer[28] || !buffer[29]) {
-                            return resolve(undefined);
-                        }
-                        const width = 1 + ((buffer[24] | (buffer[25] << 8) | (buffer[26] << 16)) & 0xFFFFFF);
-                        const height = 1 + ((buffer[27] | (buffer[28] << 8) | (buffer[29] << 16)) & 0xFFFFFF);
-                        return resolve({ width, height });
-                    } else {
-                        // 未知的WebP子格式
-                        return resolve(undefined);
-                    }
-                }
-            });
-
-            stream.on('end', () => {
-                // 如果没有读到足够的字节
-                if (totalBytes < MAX_HEADER_SIZE) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-const parsers: ReadonlyArray<ImageParser> = [
-    new PngParser(),
-    new JpegParser(),
-    new BmpParser(),
-    new GifParser(),
-    new WebpParser(),
-];
-
-export async function detectImageType(filePath: string): Promise<ImageType> {
-    return new Promise((resolve, reject) => {
-        const stream = fs.createReadStream(filePath, {
-            highWaterMark: 64, // 优化读取buffer大小
-            start: 0,
-            end: 63
-        });
-
-        let buffer: Buffer | null = null;
-
-        stream.once('error', (err) => {
-            stream.destroy();
-            reject(err);
-        });
-
-        stream.once('readable', () => {
-            buffer = stream.read(64) as Buffer;
-            stream.destroy();
-
-            if (!buffer) {
-                return resolve(ImageType.UNKNOWN);
-            }
-
-            for (const parser of parsers) {
-                if (parser.canParse(buffer)) {
-                    return resolve(parser.type);
-                }
-            }
-
-            resolve(ImageType.UNKNOWN);
-        });
-
-        stream.once('end', () => {
-            if (!buffer) {
-                resolve(ImageType.UNKNOWN);
-            }
-        });
-    });
-}
-
-export async function imageSizeFromFile(filePath: string): Promise<ImageSize | undefined> {
-    try {
-        // 先检测类型
-        const type = await detectImageType(filePath);
-        const parser = parsers.find(p => p.type === type);
-        if (!parser) {
-            return undefined;
-        }
-
-        // 用流式方式解析尺寸
-        const stream = fs.createReadStream(filePath);
-        try {
-            return await parser.parseSize(stream);
-        } catch (err) {
-            console.error(`解析图片尺寸出错: ${err}`);
-            return undefined;
-        } finally {
-            if (!stream.destroyed) {
-                stream.destroy();
-            }
-        }
-    } catch (err) {
-        console.error(`检测图片类型出错: ${err}`);
-        return undefined;
-    }
-}
-
-export async function imageSizeFallBack(
-    filePath: string,
-    fallback: ImageSize = {
-        width: 1024,
-        height: 1024,
-    }
-): Promise<ImageSize> {
-    return await imageSizeFromFile(filePath) ?? fallback;
-}

src/onebot/action/extends/ClickInlineKeyboardButton.ts

@@ -3,7 +3,7 @@ import { OneBotAction } from '../OneBotAction';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     bot_appid: Type.String(),
     button_id: Type.String({ default: '' }),
     callback_data: Type.String({ default: '' }),
@@ -25,6 +25,6 @@ export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
             callback_data: payload.callback_data,
             dmFlag: 0,
             chatType: 2
-        });
+        })
     }
 }

src/onebot/action/extends/FetchCustomFace.ts

@@ -3,7 +3,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 
 const SchemaData = Type.Object({
-    count: Type.Number({ default: 48 }),
+    count: Type.Union([Type.Number(), Type.String()], { default: 48 }),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/FetchEmojiLike.ts

@@ -5,7 +5,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { type NTQQMsgApi } from '@/core/apis';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
     emojiId: Type.Union([Type.Number(), Type.String()]),
     emojiType: Type.Union([Type.Number(), Type.String()]),
     count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
@@ -18,7 +18,7 @@ export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQ
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const msgIdPeer = MessageUnique.getInnerData(payload.message_id);
+        const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msgIdPeer) throw new Error('消息不存在');
         const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
         if (!msg) throw new Error('消息不存在');

src/onebot/action/extends/GetAiCharacters.ts

@@ -4,7 +4,7 @@ import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
 import { Type, Static } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     chat_type: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
 });
 

src/onebot/action/extends/GetCollectionList.ts

@@ -4,8 +4,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Type, Static } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    category: Type.Number({ default: 0 }),
-    count: Type.Number({ default: 1 }),
+    category: Type.Union([Type.Number(), Type.String()]),
+    count: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/GetGroupInfoEx.ts

@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { Type, Static } from '@sinclair/typebox';
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/GetProfileLike.ts

@@ -4,9 +4,9 @@ import { ActionName } from '@/onebot/action/router';
 import { Type, Static } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.Optional(Type.String()),
-    start: Type.String({ default: '0' }),
-    count: Type.String({ default: '10' })
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    start: Type.Union([Type.Number(), Type.String()], { default: 0 }),
+    count: Type.Union([Type.Number(), Type.String()], { default: 10 })
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -36,7 +36,7 @@ export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
             uint64_uin: self_id,
             uint64_top: 0,
             uint32_req_num: 99,
-            bytes_cookies: ''
+            bytes_cookies: ""
         };
         const packed_data = await this.pack_data(JSON.stringify(req_json));
         const data = Buffer.from(packed_data).toString('hex');

src/onebot/action/extends/GetUserStatus.ts

@@ -3,7 +3,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.String(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/MoveGroupFile.ts

@@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_id: Type.String(),
     current_parent_directory: Type.String(),
     target_parent_directory: Type.String(),

src/onebot/action/extends/RenameGroupFile.ts

@@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_id: Type.String(),
     current_parent_directory: Type.String(),
     new_name: Type.String(),

src/onebot/action/extends/SetDiyOnlineStatus.ts

@@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    face_id: Type.String(),// 参考 face_config.json 的 QSid
-    face_type: Type.String({ default: '1' }),
+    face_id: Type.Union([Type.Number(), Type.String()]),// 参考 face_config.json 的 QSid
+    face_type: Type.Union([Type.Number(), Type.String()], { default: '1' }),
     wording: Type.String({ default: ' ' }),
 });
 
@@ -16,9 +16,9 @@ export class SetDiyOnlineStatus extends OneBotAction<Payload, string> {
 
     async _handle(payload: Payload) {
         const ret = await this.core.apis.UserApi.setDiySelfOnlineStatus(
-            payload.face_id,
+            payload.face_id.toString(),
             payload.wording,
-            payload.face_type,
+            payload.face_type.toString(),
         );
         if (ret.result !== 0) {
             throw new Error('设置在线状态失败');

src/onebot/action/extends/SetGroupSign.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/extends/SetInputStatus.ts

@@ -4,7 +4,7 @@ import { ChatType } from '@/core';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.String(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     event_type: Type.Number(),
 });
 

src/onebot/action/extends/SetOnlineStatus.ts

@@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    status: Type.Number(),
-    ext_status: Type.Number(),
-    battery_status: Type.Number(),
+    status: Type.Union([Type.Number(), Type.String()]),
+    ext_status: Type.Union([Type.Number(), Type.String()]),
+    battery_status: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -16,9 +16,9 @@ export class SetOnlineStatus extends OneBotAction<Payload, null> {
 
     async _handle(payload: Payload) {
         const ret = await this.core.apis.UserApi.setSelfOnlineStatus(
-            payload.status,
-            payload.ext_status,
-            payload.battery_status,
+            +payload.status,
+            +payload.ext_status,
+            +payload.battery_status,
         );
         if (ret.result !== 0) {
             throw new Error('设置在线状态失败');

src/onebot/action/extends/SetSpecialTitle.ts

@@ -3,8 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     special_title: Type.String({ default: '' }),
 });
 

src/onebot/action/extends/ShareContact.ts

@@ -4,8 +4,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.Optional(Type.String()),
-    group_id: Type.Optional(Type.String()),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
     phoneNumber: Type.String({ default: '' }),
 });
 
@@ -29,7 +29,7 @@ export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
 }
 
 const SchemaDataGroupEx = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type PayloadGroupEx = Static<typeof SchemaDataGroupEx>;

src/onebot/action/extends/TransGroupFile.ts

@@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_id: Type.String(),
 });
 

src/onebot/action/file/GetGroupFileUrl.ts

@@ -4,7 +4,7 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_id: Type.String(),
 });
 

src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     folder_name: Type.String(),
 });
 

src/onebot/action/go-cqhttp/DeleteGroupFile.ts

@@ -6,7 +6,7 @@ import { Static, Type } from '@sinclair/typebox';
 import { NTQQGroupApi } from '@/core/apis';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_id: Type.String(),
 });
 

src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts

@@ -4,7 +4,7 @@ import { Static, Type } from '@sinclair/typebox';
 import { NTQQGroupApi } from '@/core/apis';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     folder_id: Type.Optional(Type.String()),
     folder: Type.Optional(Type.String()),
 });

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -117,7 +117,8 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             }
             throw new Error('ResId无效: 找不到相关的聊天记录');
         }
-        const rootMsg = MessageUnique.getInnerData(msgId);
+        const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
+        const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
 
         if (rootMsg) {
             // 5. 获取消息内容

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -12,7 +12,7 @@ interface Response {
 }
 const SchemaData = Type.Object({
     user_id: Type.String(),
-    message_id: Type.Optional(Type.String()),
+    message_seq: Type.Optional(Type.String()),
     count: Type.Number({ default: 20 }),
     reverseOrder: Type.Boolean({ default: false })
 });
@@ -24,24 +24,24 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
     override actionName = ActionName.GetFriendMsgHistory;
     override payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, _adapter: string, _config: NetworkAdapterConfig): Promise<Response> {
+    async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
         //处理参数
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error(`记录${payload.user_id}不存在`);
         const friend = await this.core.apis.FriendApi.isBuddy(uid);
         const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid };
-        const hasMessageId = !payload.message_id ? !!payload.message_id : !(payload.message_id?.toString() === '' || payload.message_id?.toString() === '0');
-        const startMsgId = hasMessageId ? (MessageUnique.getInnerData(payload.message_id!)?.MsgId ?? payload.message_id!.toString()) : '0';
-        const msgList = hasMessageId ?
+        const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
+        const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
+        const msgList = hasMessageSeq ?
             (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
-        if (msgList.length === 0) throw new Error(`消息${payload.message_id}不存在`);
+        if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.getOutputData({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId, msg.msgSeq);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg)))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts

@@ -5,7 +5,7 @@ import { OB11Construct } from '@/onebot/helper/data';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     folder_id: Type.Optional(Type.String()),
     folder: Type.Optional(Type.String()),
     file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),

src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts

@@ -4,7 +4,7 @@ import { WebHonorType } from '@/core/types';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     type: Type.Optional(Type.Enum(WebHonorType))
 });
 

src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -4,13 +4,15 @@ import { ActionName } from '@/onebot/action/router';
 import { ChatType, Peer } from '@/core/types';
 import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+
 interface Response {
     messages: OB11Message[];
 }
 
 const SchemaData = Type.Object({
     group_id: Type.String(),
-    message_id: Type.Optional(Type.String()),
+    message_seq: Type.Optional(Type.String()),
     count: Type.Number({ default: 20 }),
     reverseOrder: Type.Boolean({ default: false })
 });
@@ -23,21 +25,21 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
     override actionName = ActionName.GoCQHTTP_GetGroupMsgHistory;
     override payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, _adapter: string): Promise<Response> {
+    async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
         const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
-        const hasMessageSeq = !payload.message_id ? !!payload.message_id : !(payload.message_id?.toString() === '' || payload.message_id?.toString() === '0');
+        const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
-        const startMsgId = hasMessageSeq ? (MessageUnique.getInnerData(payload.message_id!)?.MsgId ?? payload.message_id!.toString()) : '0';
+        const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
         const msgList = hasMessageSeq ?
             (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
-        if (msgList.length === 0) throw new Error(`消息${payload.message_id}不存在`);
+        if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.getOutputData({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId, msg.msgSeq);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(
-            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg)))
+            msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat)))
         ).filter(msg => msg !== undefined);
         return { 'messages': ob11MsgList };
     }

src/onebot/action/go-cqhttp/GetGroupRootFiles.ts

@@ -6,7 +6,7 @@ import { OB11Construct } from '@/onebot/helper/data';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
 });
 

src/onebot/action/go-cqhttp/GetStrangerInfo.ts

@@ -6,7 +6,7 @@ import { calcQQLevel } from '@/common/helper';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.String(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
 });
 
@@ -28,7 +28,7 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
             ...extendData.detail.simpleInfo.baseInfo,
             ...extendData.detail.simpleInfo.relationFlags ?? {},
             ...extendData.detail.simpleInfo.status ?? {},
-            user_id: extendData.detail.uin ?? 0,
+            user_id: parseInt(extendData.detail.uin) ?? 0,
             uid: info.uid ?? uid,
             nickname: extendData.detail.simpleInfo.coreInfo.nick ?? '',
             age: extendData.detail.simpleInfo.baseInfo.age ?? info.age,

src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts

@@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    friend_id: Type.Optional(Type.String()),
-    user_id: Type.Optional(Type.String()),
+    friend_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
+    user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
     temp_block: Type.Optional(Type.Boolean()),
     temp_both_del: Type.Optional(Type.Boolean()),
 });

src/onebot/action/go-cqhttp/QuickAction.ts

@@ -0,0 +1,19 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { QuickAction, QuickActionEvent } from '@/onebot/types';
+
+interface Payload {
+    context: QuickActionEvent,
+    operation: QuickAction
+}
+
+export class GoCQHTTPHandleQuickAction extends OneBotAction<Payload, null> {
+    override actionName = ActionName.GoCQHTTP_HandleQuickAction;
+
+    async _handle(payload: Payload): Promise<null> {
+        this.obContext.apis.QuickActionApi
+            .handleQuickOperation(payload.context, payload.operation)
+            .catch(e => this.core.context.logger.logError(e));
+        return null;
+    }
+}

src/onebot/action/go-cqhttp/SendGroupNotice.ts

@@ -5,7 +5,7 @@ import { unlink } from 'node:fs/promises';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     content: Type.String(),
     image: Type.Optional(Type.String()),
     pinned: Type.Union([Type.Number(), Type.String()], { default: 0 }),

src/onebot/action/go-cqhttp/SetGroupPortrait.ts

@@ -6,7 +6,7 @@ import fs from 'node:fs/promises';
 import { GeneralCallResult } from '@/core';
 const SchemaData = Type.Object({
     file: Type.String(),
-    group_id: Type.String()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/go-cqhttp/UploadGroupFile.ts

@@ -7,7 +7,7 @@ import { SendMessageContext } from '@/onebot/api';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     file: Type.String(),
     name: Type.String(),
     folder: Type.Optional(Type.String()),

src/onebot/action/go-cqhttp/UploadPrivateFile.ts

@@ -8,7 +8,7 @@ import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    user_id: Type.String(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     file: Type.String(),
     name: Type.String(),
 });

src/onebot/action/group/DelEssenceMsg.ts

@@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -13,7 +13,7 @@ export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload): Promise<unknown> {
-        const msg = MessageUnique.getInnerData(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msg) {
             const data = this.core.apis.GroupApi.essenceLRU.getValue(+payload.message_id);
             if(!data) throw new Error('消息不存在');

src/onebot/action/group/DelGroupNotice.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     notice_id: Type.String()
 });
 

src/onebot/action/group/GetAiRecord.ts

@@ -5,7 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
     character: Type.String(),
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     text: Type.String(),
 });
 

src/onebot/action/group/GetGroupEssence.ts

@@ -4,8 +4,10 @@ import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import crypto from 'crypto';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -20,12 +22,12 @@ export class GetGroupEssence extends OneBotAction<Payload, unknown> {
             return undefined;
         }
         return {
-            id: MessageUnique.getOutputData(peer, replyMsgList.msgId, replyMsgList.msgSeq),
+            id: MessageUnique.createUniqueMsgId(peer, replyMsgList.msgId),
             msg: replyMsgList
         };
     }
 
-    async _handle(payload: Payload, _adapter: string) {
+    async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig) {
         const msglist = (await this.core.apis.WebApi.getGroupEssenceMsgAll(payload.group_id.toString())).flatMap((e) => e.data.msg_list);
         if (!msglist) {
             throw new Error('获取失败');
@@ -46,7 +48,7 @@ export class GetGroupEssence extends OneBotAction<Payload, unknown> {
                     operator_nick: msg.add_digest_nick,
                     message_id: message_id,
                     operator_time: msg.add_digest_time,
-                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage))?.message
+                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, config.messagePostFormat))?.message
                 };
             }
             const msgTempData = JSON.stringify({

src/onebot/action/group/GetGroupInfo.ts

@@ -5,7 +5,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -5,8 +5,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id:  Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 

src/onebot/action/group/GetGroupMemberList.ts

@@ -6,7 +6,7 @@ import { Static, Type } from '@sinclair/typebox';
 import { GroupMember } from '@/core';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
 

src/onebot/action/group/GetGroupNotice.ts

@@ -17,7 +17,7 @@ interface GroupNotice {
 }
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/group/GetGroupShutList.ts

@@ -4,7 +4,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/group/GroupPoke.ts

@@ -3,8 +3,8 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/group/SendGroupAiRecord.ts

@@ -5,7 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
     character: Type.String(),
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     text: Type.String(),
 });
 

src/onebot/action/group/SetEssenceMsg.ts

@@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -14,7 +14,7 @@ export default class SetEssenceMsg extends OneBotAction<Payload, unknown> {
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const msg = MessageUnique.getInnerData(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msg) {
             throw new Error('msg not found');
         }

src/onebot/action/group/SetGroupAdmin.ts

@@ -4,8 +4,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 

src/onebot/action/group/SetGroupBan.ts

@@ -3,9 +3,9 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
-    duration: Type.String({ default: '0' }),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
+    duration: Type.Union([Type.Number(), Type.String()], { default: 0 }),
 });
 
 type Payload = Static<typeof SchemaData>;

src/onebot/action/group/SetGroupCard.ts

@@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     card: Type.Optional(Type.String())
 });
 

src/onebot/action/group/SetGroupKick.ts

@@ -3,8 +3,8 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
-    user_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
     reject_add_request: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 

src/onebot/action/group/SetGroupLeave.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     is_dismiss: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 

src/onebot/action/group/SetGroupName.ts

@@ -4,7 +4,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     group_name: Type.String(),
 });
 

src/onebot/action/group/SetGroupWholeBan.ts

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.String(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
     enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
@@ -15,10 +15,7 @@ export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const enable = payload.enable?.toString() !== 'false';
-        let res = await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
-        if (res.result !== 0) {
-            throw new Error(`SetGroupWholeBan failed: ${res.errMsg} ${res.result}`);
-        }
+        await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
         return null;
     }
 }

src/onebot/action/index.ts

@@ -30,6 +30,7 @@ import SetGroupAdmin from './group/SetGroupAdmin';
 import SetGroupCard from './group/SetGroupCard';
 import GetImage from './file/GetImage';
 import GetRecord from './file/GetRecord';
+import { GoCQHTTPMarkMsgAsRead, MarkAllMsgAsRead, MarkGroupMsgAsRead, MarkPrivateMsgAsRead } from './msg/MarkMsgAsRead';
 import GoCQHTTPUploadGroupFile from './go-cqhttp/UploadGroupFile';
 import SetQQAvatar from '@/onebot/action/extends/SetQQAvatar';
 import GoCQHTTPDownloadFile from './go-cqhttp/DownloadFile';
@@ -47,6 +48,7 @@ import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from '@/onebot/action/m
 import { GetFriendWithCategory } from './extends/GetFriendWithCategory';
 import { SendGroupNotice } from './go-cqhttp/SendGroupNotice';
 import { GetGroupHonorInfo } from './go-cqhttp/GetGroupHonorInfo';
+import { GoCQHTTPHandleQuickAction } from './go-cqhttp/QuickAction';
 import { GetGroupIgnoredNotifies } from './group/GetGroupIgnoredNotifies';
 import { GetOnlineClient } from './go-cqhttp/GetOnlineClient';
 import { IOCRImage, OCRImage } from './extends/OCRImage';
@@ -136,6 +138,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new SetLongNick(obContext, core),
         new ForwardFriendSingleMsg(obContext, core),
         new ForwardGroupSingleMsg(obContext, core),
+        new MarkGroupMsgAsRead(obContext, core),
+        new MarkPrivateMsgAsRead(obContext, core),
         new SetQQAvatar(obContext, core),
         new TranslateEnWordToZn(obContext, core),
         new GetGroupRootFiles(obContext, core),
@@ -195,14 +199,17 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GoCQHTTPGetStrangerInfo(obContext, core),
         new GoCQHTTPDownloadFile(obContext, core),
         new GetGuildList(obContext, core),
+        new GoCQHTTPMarkMsgAsRead(obContext, core),
         new GoCQHTTPUploadGroupFile(obContext, core),
         new GoCQHTTPGetGroupMsgHistory(obContext, core),
         new GoCQHTTPGetForwardMsgAction(obContext, core),
         new GetFriendMsgHistory(obContext, core),
+        new GoCQHTTPHandleQuickAction(obContext, core),
         new GetGroupIgnoredNotifies(obContext, core),
         new DelEssenceMsg(obContext, core),
         new SetEssenceMsg(obContext, core),
         new GetRecentContact(obContext, core),
+        new MarkAllMsgAsRead(obContext, core),
         new GetProfileLike(obContext, core),
         new SetGroupPortrait(obContext, core),
         new FetchCustomFace(obContext, core),

src/onebot/action/msg/DeleteMsg.ts

@@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -14,7 +14,7 @@ class DeleteMsg extends OneBotAction<Payload, void> {
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const msg = MessageUnique.getInnerData(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
         if (msg) {
             await this.core.apis.MsgApi.recallMsg(msg.Peer, msg.MsgId);
         } else {

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -5,9 +5,9 @@ import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
-    group_id: Type.Optional(Type.String()),
-    user_id: Type.Optional(Type.String()),
+    message_id: Type.Union([Type.Number(), Type.String()]),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -25,7 +25,7 @@ class ForwardSingleMsg extends OneBotAction<Payload, null> {
     }
 
     async _handle(payload: Payload): Promise<null> {
-        const msg = MessageUnique.getInnerData(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msg) {
             throw new Error(`无法找到消息${payload.message_id}`);
         }

src/onebot/action/msg/GetMsg.ts

@@ -4,10 +4,12 @@ import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { RawMessage } from '@/core';
 import { Static, Type } from '@sinclair/typebox';
+import { NetworkAdapterConfig } from '@/onebot/config/config';
+
 export type ReturnDataType = OB11Message
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -16,27 +18,30 @@ class GetMsg extends OneBotAction<Payload, OB11Message> {
     override actionName = ActionName.GetMsg;
     override payloadSchema = SchemaData;
 
-    async _handle(payload: Payload, _adapter: string) {
+    async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig) {
         if (!payload.message_id) {
             throw Error('参数message_id不能为空');
         }
-        const msgIdWithPeer = MessageUnique.getInnerData(payload.message_id);
+        const MsgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString());
+        const msgIdWithPeer = MessageUnique.getMsgIdAndPeerByShortId(MsgShortId ?? +payload.message_id);
         if (!msgIdWithPeer) {
             throw new Error('消息不存在');
         }
         const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType };
         const orimsg = this.obContext.recallMsgCache.get(msgIdWithPeer.MsgId);
-        let msg: RawMessage | undefined;
+        let msg: RawMessage|undefined;
         if (orimsg) {
             msg = orimsg;
         } else {
             msg = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgIdWithPeer?.MsgId || payload.message_id.toString()])).msgList[0];
         }
         if (!msg) throw Error('消息不存在');
-        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg);
+        const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg, config.messagePostFormat);
         if (!retMsg) throw Error('消息为空');
         try {
-            retMsg.message_id = MessageUnique.getOutputData(peer, msg.msgId, msg.msgSeq)!;
+            retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgId)!;
+            retMsg.message_seq = retMsg.message_id;
+            retMsg.real_id = retMsg.message_id;
         } catch {
             // ignored
         }

src/onebot/action/msg/MarkMsgAsRead.ts

@@ -0,0 +1,72 @@
+import { ChatType, Peer } from '@/core/types';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { MessageUnique } from '@/common/message-unique';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
+    group_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
+    message_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
+});
+
+type PlayloadType = Static<typeof SchemaData>;
+
+class MarkMsgAsRead extends OneBotAction<PlayloadType, null> {
+    async getPeer(payload: PlayloadType): Promise<Peer> {
+        if (payload.message_id) {
+            const s_peer = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)?.Peer;
+            if (s_peer) {
+                return s_peer;
+            }
+            const l_peer = MessageUnique.getPeerByMsgId(payload.message_id.toString())?.Peer;
+            if (l_peer) {
+                return l_peer;
+            }
+        }
+        if (payload.user_id) {
+            const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
+            if (!peerUid) {
+                throw new Error( `私聊${payload.user_id}不存在`);
+            }
+            const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid);
+            return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid };
+        }
+        if (!payload.group_id) {
+            throw new Error('缺少参数 group_id 或 user_id');
+        }
+        return { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
+    }
+
+    async _handle(payload: PlayloadType): Promise<null> {
+        const ret = await this.core.apis.MsgApi.setMsgRead(await this.getPeer(payload));
+        if (ret.result != 0) {
+            throw new Error('设置已读失败,' + ret.errMsg);
+        }
+        return null;
+    }
+}
+
+// 以下为非标准实现
+export class MarkPrivateMsgAsRead extends MarkMsgAsRead {
+    override payloadSchema = SchemaData;
+    override actionName = ActionName.MarkPrivateMsgAsRead;
+}
+
+export class MarkGroupMsgAsRead extends MarkMsgAsRead {
+    override payloadSchema = SchemaData;
+    override actionName = ActionName.MarkGroupMsgAsRead;
+}
+
+export class GoCQHTTPMarkMsgAsRead extends MarkMsgAsRead {
+    override actionName = ActionName.GoCQHTTP_MarkMsgAsRead;
+}
+
+export class MarkAllMsgAsRead extends OneBotAction<void, null> {
+    override actionName = ActionName._MarkAllMsgAsRead;
+
+    async _handle(): Promise<null> {
+        await this.core.apis.MsgApi.markAllMsgAsRead();
+        return null;
+    }
+}

src/onebot/action/msg/SendMsg.ts

@@ -7,6 +7,7 @@ import {
     OB11PostSendMsg,
 } from '@/onebot/types';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
+import { decodeCQCode } from '@/onebot/helper/cqcode';
 import { MessageUnique } from '@/common/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
@@ -16,7 +17,7 @@ import { PacketMsg } from '@/core/packet/message/message';
 import { rawMsgWithSendMsg } from '@/core/packet/message/converter';
 
 export interface ReturnDataType {
-    message_id: string;
+    message_id: number;
     res_id?: string;
 }
 
@@ -27,9 +28,11 @@ export enum ContextMode {
 }
 
 // Normalizes a mixed type (CQCode/a single segment/segment array) into a segment array.
-export function normalize(message: OB11MessageMixType): OB11MessageData[] {
+export function normalize(message: OB11MessageMixType, autoEscape = false): OB11MessageData[] {
     return typeof message === 'string' ? (
-        [{ type: OB11MessageDataType.text, data: { text: message } }]
+        autoEscape ?
+            [{ type: OB11MessageDataType.text, data: { text: message } }] :
+            decodeCQCode(message)
     ) : Array.isArray(message) ? message : [message];
 }
 
@@ -51,7 +54,7 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
                     chatType: ChatType.KCHATTYPEGROUP,
                     peerUid: payload.group_id.toString(),
                     guildId: ''
-                };
+                }
             }
             throw new Error('无法获取用户信息');
         }
@@ -121,7 +124,10 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         if (payload.message_type === 'private') this.contextMode = ContextMode.Private;
         const peer = await createContext(this.core, payload, this.contextMode);
 
-        const messages = normalize(payload.message);
+        const messages = normalize(
+            payload.message,
+            typeof payload.auto_escape === 'string' ? payload.auto_escape === 'true' : !!payload.auto_escape,
+        );
 
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {
             const packetMode = this.core.apis.PacketApi.available;
@@ -137,14 +143,11 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 throw Error('发送合并转发消息失败：returnMsgAndResId 为空！');
             }
             if (returnMsgAndResId.message) {
-                const msgShortId = MessageUnique.getOutputData({
+                const msgShortId = MessageUnique.createUniqueMsgId({
                     guildId: '',
                     peerUid: peer.peerUid,
                     chatType: peer.chatType,
-                },
-                (returnMsgAndResId.message).msgId,
-                (returnMsgAndResId.message).msgSeq
-                );
+                }, (returnMsgAndResId.message).msgId);
                 return { message_id: msgShortId!, res_id: returnMsgAndResId.res_id! };
             } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) {
                 throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`);
@@ -171,11 +174,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         nickname: string,
     }, dp: number = 0): Promise<{
         finallySendElements: SendArkElement,
-        res_id?: string,
-        deleteAfterSentFiles: string[],
+        res_id?: string
     } | null> {
         const packetMsg: PacketMsg[] = [];
-        let delFiles: string[] = [];
         for (const node of messageNodes) {
             if (dp >= 3) {
                 this.core.context.logger.logWarn('转发消息深度超过3层，将停止解析！');
@@ -191,11 +192,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                         nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户',
                     }, dp + 1);
                     sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
-                    delFiles.push(...(uploadReturnData?.deleteAfterSentFiles || []));
                 } else {
                     const sendElementsCreateReturn = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer);
                     sendElements = sendElementsCreateReturn.sendElements;
-                    delFiles.push(...sendElementsCreateReturn.deleteAfterSentFiles);
                 }
 
                 const packetMsgElements: rawMsgWithSendMsg = {
@@ -211,7 +210,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 packetMsg.push(transformedMsg);
             } else if (node.data.id) {
                 const id = node.data.id;
-                const nodeMsg = MessageUnique.getInnerData(id);
+                const nodeMsg = MessageUnique.getMsgIdAndPeerByShortId(+id) || MessageUnique.getPeerByMsgId(id);
                 if (!nodeMsg) {
                     this.core.context.logger.logError('转发消息失败，未找到消息', id);
                     continue;
@@ -219,8 +218,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0];
                 this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${stringifyWithBigInt(msg)}`);
                 if (msg) {
-                    let msgCache = await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
-                    delFiles.push(...msgCache);
+                    await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
                     const transformedMsg = this.core.apis.PacketApi.pkt.msgConverter.rawMsgToPacketMsg(msg, msgPeer);
                     this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${stringifyWithBigInt(transformedMsg)}`);
                     packetMsg.push(transformedMsg);
@@ -236,7 +234,6 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const resid = await this.core.apis.PacketApi.pkt.operation.UploadForwardMsg(packetMsg, msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : 0);
         const forwardJson = ForwardMsgBuilder.fromPacketMsg(resid, packetMsg, source, news, summary, prompt);
         return {
-            deleteAfterSentFiles: delFiles,
             finallySendElements: {
                 elementType: ElementType.ARK,
                 elementId: '',
@@ -258,7 +255,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const res_id = uploadReturnData?.res_id;
         const finallySendElements = uploadReturnData?.finallySendElements;
         if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
-        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], uploadReturnData.deleteAfterSentFiles || []).catch(() => undefined);
+        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], []).catch(() => undefined);
         return { message: returnMsg ?? null, res_id: res_id! };
     }
 
@@ -270,17 +267,17 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
             chatType: ChatType.KCHATTYPEC2C,
             peerUid: this.core.selfInfo.uid,
         };
-        let nodeMsgIds: { MsgId: string, Peer: Peer }[] = [];
+        let nodeMsgIds: string[] = [];
         for (const messageNode of messageNodes) {
             const nodeId = messageNode.data.id;
             if (nodeId) {
                 // 对Msgid和OB11ID混用情况兜底
-                const nodeMsg = MessageUnique.getInnerData(nodeId);
+                const nodeMsg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(nodeId)) || MessageUnique.getPeerByMsgId(nodeId);
                 if (!nodeMsg) {
                     this.core.context.logger.logError('转发消息失败，未找到消息', nodeId);
                     continue;
                 }
-                nodeMsgIds.push({ MsgId: nodeMsg.MsgId, Peer: nodeMsg.Peer });
+                nodeMsgIds.push(nodeMsg.MsgId);
             } else {
                 // 自定义的消息
                 try {
@@ -294,7 +291,8 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                         }
                         const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
                         if (nodeMsg) {
-                            nodeMsgIds.push({ MsgId: nodeMsg.message!.msgId, Peer: selfPeer });
+                            nodeMsgIds.push(nodeMsg.message!.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, nodeMsg.message!.msgId);
                         }
                         //完成子卡片生成跳过后续
                         continue;
@@ -320,8 +318,8 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                     }
                     (await Promise.allSettled(MsgNodeList)).map((result) => {
                         if (result.status === 'fulfilled' && result.value) {
-                            nodeMsgIds.push({ MsgId: result.value.msgId, Peer: selfPeer });
-                            MessageUnique.getOutputData(selfPeer, result.value.msgId, result.value.msgSeq);
+                            nodeMsgIds.push(result.value.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, result.value.msgId);
                         }
                     });
                 } catch (e: unknown) {
@@ -333,18 +331,22 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         let srcPeer: Peer | undefined = undefined;
         let needSendSelf = false;
         //检测是否处于同一个Peer 不在同一个peer则全部消息由自身发送
-        let new_nodeMsgIds: { MsgId: string, Peer: Peer }[] = [];
-        for (const data of nodeMsgIds) {
-            const nodeMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(data.Peer, [data.MsgId])).msgList[0];
+        for (const msgId of nodeMsgIds) {
+            const nodeMsgPeer = MessageUnique.getPeerByMsgId(msgId);
+            if (!nodeMsgPeer) {
+                this.core.context.logger.logError('转发消息失败，未找到消息', msgId);
+                continue;
+            }
+            const nodeMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsgPeer.Peer, [msgId])).msgList[0];
             if (nodeMsg) {
                 srcPeer = srcPeer ?? { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid };
                 if (srcPeer.peerUid !== nodeMsg.peerUid) {
                     needSendSelf = true;
                 }
-                new_nodeMsgIds.push({ MsgId: nodeMsg.msgId, Peer: data.Peer });
+                nodeMsgArray.push(nodeMsg);
             }
         }
-        nodeMsgIds = new_nodeMsgIds;
+        nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
         let retMsgIds: string[] = [];
         if (needSendSelf) {
             for (const [, msg] of nodeMsgArray.entries()) {
@@ -356,7 +358,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 if (ClonedMsg) retMsgIds.push(ClonedMsg.msgId);
             }
         } else {
-            retMsgIds = nodeMsgIds.map((msg) => msg.MsgId);
+            retMsgIds = nodeMsgIds;
         }
         if (retMsgIds.length === 0) throw Error('转发消息失败，生成节点为空');
         try {

src/onebot/action/msg/SetMsgEmojiLike.ts

@@ -4,7 +4,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    message_id: Type.String(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
     emoji_id: Type.Union([Type.Number(), Type.String()]),
     set: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
@@ -16,7 +16,7 @@ export class SetMsgEmojiLike extends OneBotAction<Payload, unknown> {
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const msg = MessageUnique.getInnerData(payload.message_id);
+        const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msg) {
             throw new Error('msg not found');
         }