release: 2.2.22

fix: 转发消息报错

manifest.json

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

package.json

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

src/common/helper.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'fs';
 import os from 'node:os';
-import { QQLevel } from '@/core';
+import { Peer, QQLevel } from '@/core';
 
 export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
     return new Promise<ReturnType<T> | undefined>((resolve) => {
@@ -23,29 +23,48 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
         });
     });
 }
-
-//下面这个类是用于将uid+msgid合并的类
-export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
-        const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
-        return `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-            12,
-            16,
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+export class FileNapCatOneBotUUID {
+    static encodeModelId(peer: Peer, modelId: string): string {
+        return `NapCatOneBot-ModeldFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
     }
-
-    static decode(uuid: string): { high: string; low: string } {
-        const hex = uuid.replace(/-/g, '');
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
+    static decodeModelId(uuid: string): undefined | {
+        peer: Peer,
+        modelId: string
+    } {
+        if (!uuid.startsWith('NapCatOneBot-ModeldFile-')) return undefined;
+        const data = uuid.split('-');
+        if (data.length !== 5) return undefined;
+        const [, , chatType, peerUid, modelId] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid
+            },
+            modelId,
+        };
+    }
+    static encode(peer: Peer, msgId: string, elementId: string): string {
+        return `NapCatOneBot-MsgFile-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
+    }
+    static decode(uuid: string): undefined | {
+        peer: Peer,
+        msgId: string,
+        elementId: string
+    } {
+        if (!uuid.startsWith('NapCatOneBot-File-')) return undefined;
+        const data = uuid.split('-');
+        if (data.length !== 6) return undefined;
+        const [, , chatType, peerUid, msgId, elementId] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid
+            },
+            msgId,
+            elementId,
+        };
     }
 }
-
 export function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }

src/common/message-unique.ts

@@ -91,7 +91,7 @@ class MessageUniqueWrapper {
         return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
     }
 
-    createMsg(peer: Peer, msgId: string) {
+    createUniqueMsgId(peer: Peer, msgId: string) {
         const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
         const hash = crypto.createHash('md5').update(key).digest();
         //设置第一个bit为0 保证shortId为正数

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.20';
+export const napCatVersion = '2.2.22';

src/core/apis/file.ts

@@ -302,7 +302,18 @@ export class NTQQFileApi {
     async downloadMediaByUuid() {
         //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
     }
-
+    async downloadFileForModelId(peer: Peer, modelId: string, timeout = 1000 * 60 * 2) {
+        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/downloadFileForModelId',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [peer, [modelId]],
+            () => true,
+            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
+            1,
+            timeout,
+        );
+        return fileTransNotifyInfo.filePath;
+    }
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
         //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等

src/core/apis/group.ts

@@ -12,6 +12,7 @@ import {
     NapCatCore,
 } from '@/core';
 import { isNumeric, runAllWithTimeout } from '@/common/helper';
+import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -19,6 +20,7 @@ export class NTQQGroupApi {
     groupCache: Map<string, Group> = new Map<string, Group>();
     groupMemberCache: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
     groups: Group[] = [];
+    essenceLRU = new LimitedHashTable<number, string>(1000);
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
@@ -33,6 +35,17 @@ export class NTQQGroupApi {
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
     }
+    async fetchGroupEssenceList(groupCode: string) {
+        const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
+        return this.context.session.getGroupService().fetchGroupEssenceList({
+            groupCode: groupCode,
+            pageStart: 0,
+            pageLimit: 300
+        }, pskey);
+    }
+    async clearGroupNotifiesUnreadCount(unk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk);
+    }
     async setGroupAvatar(gc: string, filePath: string) {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
@@ -270,7 +283,15 @@ export class NTQQGroupApi {
         //应该是直接返回不需要Listener的 未经测试 需测试再发布
         return this.context.session.getGroupService().quitGroupV2(param);
     }
-
+    async removeGroupEssenceBySeq(GroupCode: string, msgRandom: string, msgSeq: string) {
+        const param = {
+            groupCode: GroupCode,
+            msgRandom: parseInt(msgRandom),
+            msgSeq: parseInt(msgSeq),
+        };
+        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
+        return this.context.session.getGroupService().removeGroupEssence(param);
+    }
     async removeGroupEssence(GroupCode: string, msgId: string) {
         // 代码没测过
         // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom

src/core/apis/webapi.ts

@@ -27,7 +27,7 @@ export class NTQQWebApi {
             msg_random: msgRandom,
             target_group_code: targetGroupCode,
         }).toString()
-        }`;
+            }`;
         try {
             return RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
         } catch (e) {
@@ -35,19 +35,17 @@ export class NTQQWebApi {
         }
     }
 
-    async getGroupEssenceMsg(GroupCode: string, page_start: string) {
+    async getGroupEssenceMsg(GroupCode: string) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${new URLSearchParams({
             bkn: this.getBknFromCookie(cookieObject),
             group_code: GroupCode,
-            page_start,
-            page_limit: '20',
         }).toString()
-        }`;
+            }`;
         let ret;
         try {
             ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>
-            (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
         } catch {
             return undefined;
         }
@@ -63,14 +61,14 @@ export class NTQQWebApi {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const retList: Promise<WebApiGroupMemberRet>[] = [];
         const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-        (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
-            st: '0',
-            end: '40',
-            sort: '1',
-            gc: GroupCode,
-            bkn: this.getBknFromCookie(cookieObject),
-        }).toString()
-        }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+                st: '0',
+                end: '40',
+                sort: '1',
+                gc: GroupCode,
+                bkn: this.getBknFromCookie(cookieObject),
+            }).toString()
+                }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
         if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
             return [];
         } else {
@@ -83,14 +81,14 @@ export class NTQQWebApi {
         //遍历批量请求
         for (let i = 2; i <= PageNum; i++) {
             const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
-                st: ((i - 1) * 40).toString(),
-                end: (i * 40).toString(),
-                sort: '1',
-                gc: GroupCode,
-                bkn: this.getBknFromCookie(cookieObject),
-            }).toString()
-            }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+                    st: ((i - 1) * 40).toString(),
+                    end: (i * 40).toString(),
+                    sort: '1',
+                    gc: GroupCode,
+                    bkn: this.getBknFromCookie(cookieObject),
+                }).toString()
+                    }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
             retList.push(ret);
         }
         //批量等待
@@ -123,15 +121,15 @@ export class NTQQWebApi {
         let ret: any = undefined;
         try {
             ret = await RequestUtil.HttpGetJson<any>
-            (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
-                bkn: this.getBknFromCookie(cookieObject),
-                qid: GroupCode,
-                text: Content,
-                pinned: '0',
-                type: '1',
-                settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
-            }).toString()
-            }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
+                    bkn: this.getBknFromCookie(cookieObject),
+                    qid: GroupCode,
+                    text: Content,
+                    pinned: '0',
+                    type: '1',
+                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
+                }).toString()
+                    }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
             return ret;
         } catch (e) {
             return undefined;
@@ -162,7 +160,7 @@ export class NTQQWebApi {
                 gc: Internal_groupCode,
                 type: Internal_type.toString(),
             }).toString()
-            }`;
+                }`;
             let resJson;
             try {
                 const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });

src/core/listeners/NodeIKernelMsgListener.ts

@@ -1,5 +1,25 @@
 import { ChatType, RawMessage } from '@/core/entities';
-
+export interface CommonFileInfo {
+    bizType: null;
+    chatType: number;
+    elemId: string;
+    favId: null;
+    fileModelId: string;
+    fileName: string;
+    fileSize: string;
+    md5: string;
+    md510m: string;
+    msgId: string;
+    msgTime: string;
+    parent: null;
+    peerUid: string;
+    picThumbPath: null;
+    sha: string;
+    sha3: string;
+    subId: string;
+    uuid: string;
+    [property: string]: any;
+}
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string,
     msgElementId: string,
@@ -15,7 +35,7 @@ export interface OnRichMediaDownloadCompleteParams {
     totalSize: string,
     trasferStatus: number,
     step: number,
-    commonFileInfo: unknown | null,
+    commonFileInfo?: CommonFileInfo,
     fileSrvErrCode: string,
     clientMsg: string,
     businessId: number,

src/core/services/NodeIKernelGroupService.ts

@@ -189,7 +189,7 @@ export interface NodeIKernelGroupService {
 
     getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>;
 
-    clearGroupNotifiesUnreadCount(groupCode: string): void;
+    clearGroupNotifiesUnreadCount(unknown: boolean): void;
 
     operateSysNotify(
         doubt: boolean,

src/core/services/NodeIKernelRichMediaService.ts

@@ -155,7 +155,7 @@ export interface NodeIKernelRichMediaService {
     }): unknown;
 
     //arg3为“”
-    downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown;
+    downloadFileForModelId(peer: Peer, ModelId: string[]): Promise<unknown>;
 
     //第三个参数 Array<Type>
     // this.fileId = "";

src/onebot/action/file/GetFile.ts

@@ -1,8 +1,8 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
-import { UUIDConverter } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 import { ActionName } from '../types';
-import { ChatType, ElementType, Peer, RawMessage } from '@/core/entities';
+import { ChatType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 export interface GetFilePayload {
@@ -29,64 +29,64 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     payloadSchema: any = GetFileBase_PayloadSchema;
 
     async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const NTQQFriendApi = this.core.apis.FriendApi;
-        const NTQQUserApi = this.core.apis.UserApi;
         const NTQQMsgApi = this.core.apis.MsgApi;
-        const NTQQGroupApi = this.core.apis.GroupApi;
         const NTQQFileApi = this.core.apis.FileApi;
-        try {
-            const uuidData = UUIDConverter.decode(payload.file);
-            const peerUin = uuidData.high;
-            const msgId = uuidData.low;
-            const isGroup: boolean = !!(await NTQQGroupApi.getGroups(false)).find(e => e.groupCode == peerUin);
-            let peer: Peer | undefined;
-            //识别Peer
-            if (isGroup) {
-                peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: peerUin };
-            }
-            const PeerUid = await NTQQUserApi.getUidByUinV2(peerUin);
-            if (PeerUid) {
-                const isBuddy = await NTQQFriendApi.isBuddy(PeerUid);
-                if (isBuddy) {
-                    peer = { chatType: ChatType.KCHATTYPEC2C, peerUid: PeerUid };
-                } else {
-                    peer = { chatType: ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: PeerUid };
-                }
-            }
-            if (!peer) {
-                throw new Error('chattype not support');
-            }
-            const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]);
-            if (msgList.msgList.length == 0) {
-                throw new Error('msg not found');
-            }
-            const msg = msgList.msgList[0];
-            const findEle = msg.elements.find(e => e.elementType == ElementType.VIDEO || e.elementType == ElementType.FILE || e.elementType == ElementType.PTT);
-            if (!findEle) {
-                throw new Error('element not found');
-            }
-            const downloadPath = await NTQQFileApi.downloadMedia(msgId, msg.chatType, msg.peerUid, findEle.elementId, '', '');
-            const fileSize = findEle?.videoElement?.fileSize || findEle?.fileElement?.fileSize || findEle?.pttElement?.fileSize || '0';
-            const fileName = findEle?.videoElement?.fileName || findEle?.fileElement?.fileName || findEle?.pttElement?.fileName || '';
+
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
+
+        //接收消息标记模式
+        if (contextMsgFile) {
+            const { peer, msgId, elementId } = contextMsgFile;
+
+            const downloadPath = await NTQQFileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
+
+            const mixElement = (await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
+                .find(msg => msg.msgId === msgId)?.elements.find(e => e.elementId === elementId);
+            const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
+            if (!mixElementInner) throw new Error('element not found');
+
+            const fileSize = mixElementInner.fileSize?.toString() || '';
+            const fileName = mixElementInner.fileName || '';
+
             const res: GetFileResponse = {
                 file: downloadPath,
                 url: downloadPath,
                 file_size: fileSize,
                 file_name: fileName,
             };
-            if (/* enableLocalFile2Url && */ downloadPath) {
+
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
+                try {
+                    res.base64 = await fs.readFile(downloadPath, 'base64');
+                } catch (e) {
+                    throw new Error('文件下载失败. ' + e);
+                }
+            }
+            return res;
+        }
+        //群文件模式
+        const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
+        if (contextModelIdFile) {
+            const { peer, modelId } = contextModelIdFile;
+            const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId);
+            const res: GetFileResponse = {
+                file: downloadPath,
+                url: downloadPath,
+                file_size: '',
+                file_name: '',
+            };
+
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
                     throw new Error('文件下载失败. ' + e);
                 }
             }
-            //不手动删除？文件持久化了
             return res;
-        } catch {
-            this.core.context.logger.logDebug('GetFileBase Mode - 1 Error');
         }
 
+        //搜索名字模式
         const NTSearchNameResult = (await NTQQFileApi.searchfile([payload.file])).resultItems;
         if (NTSearchNameResult.length !== 0) {
             const MsgId = NTSearchNameResult[0].msgId;
@@ -94,9 +94,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
             if (NTSearchNameResult[0].chatType == ChatType.KCHATTYPEGROUP) {
                 peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: NTSearchNameResult[0].groupChatInfo[0].groupCode };
             }
-            if (!peer) {
-                throw new Error('chattype not support');
-            }
+            if (!peer) throw new Error('chattype not support');
             const msgList: RawMessage[] = (await NTQQMsgApi.getMsgsByMsgId(peer, [MsgId]))?.msgList;
             if (!msgList || msgList.length == 0) {
                 throw new Error('msg not found');
@@ -113,16 +111,16 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
                 file_size: NTSearchNameResult[0].fileSize.toString(),
                 file_name: NTSearchNameResult[0].fileName,
             };
-            if (/* enableLocalFile2Url && */ downloadPath) {
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
                     throw new Error('文件下载失败. ' + e);
                 }
             }
-            //不手动删除？文件持久化了
             return res;
         }
+
         throw new Error('file not found');
     }
 }

src/onebot/action/file/GetGroupFileList.ts

@@ -6,8 +6,9 @@ const SchemaData = {
     type: 'object',
     properties: {
         group_id: { type: ['string', 'number'] },
-        start_index: { type: 'number' },
-        file_count: { type: 'number' },
+        start_index: { type: ['string', 'number'] },
+        file_count: { type: ['string', 'number'] },
+        folder_id: { type: ['string', 'number'] },
     },
     required: ['group_id', 'start_index', 'file_count'],
 } as const satisfies JSONSchema;
@@ -20,12 +21,19 @@ export class GetGroupFileList extends BaseAction<Payload, { FileList: Array<any>
 
     async _handle(payload: Payload) {
         const NTQQMsgApi = this.core.apis.MsgApi;
+        let param = {};
+        if (payload.folder_id) {
+            param = {
+                folderId: payload.folder_id.toString(),
+            };
+        }
         const ret = await NTQQMsgApi.getGroupFileList(payload.group_id.toString(), {
             sortType: 1,
-            fileCount: payload.file_count,
-            startIndex: payload.start_index,
+            fileCount: +payload.file_count,
+            startIndex: +payload.start_index,
             sortOrder: 2,
             showOnlinedocFolder: 0,
+            ...param
         }).catch((e) => {
             return [];
         });

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

@@ -38,7 +38,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
             const resMsg = await this.obContext.apis.MsgApi
                 .parseMessage(msg);
             if (!resMsg) return;
-            resMsg.message_id = MessageUnique.createMsg({
+            resMsg.message_id = MessageUnique.createUniqueMsgId({
                 guildId: '',
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,

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

@@ -47,7 +47,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
         if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(

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

@@ -42,7 +42,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
         if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(

src/onebot/action/group/DelEssenceMsg.ts

@@ -20,7 +20,13 @@ export default class DelEssenceMsg extends BaseAction<Payload, any> {
     async _handle(payload: Payload): Promise<any> {
         const NTQQGroupApi = this.core.apis.GroupApi;
         const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
-        if (!msg) throw new Error('msg not found');
+        const NTQQWebApi = this.core.apis.WebApi;
+        if (!msg) {
+            const data = NTQQGroupApi.essenceLRU.getValue(+payload.message_id);
+            if(!data) throw new Error('消息不存在');
+            const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string };
+            return await NTQQGroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random);
+        }
         return await NTQQGroupApi.removeGroupEssence(
             msg.Peer.peerUid,
             msg.MsgId,

src/onebot/action/group/GetGroupEssence.ts

@@ -1,29 +1,117 @@
-import { GroupEssenceMsgRet } from '@/core';
+import { ChatType, GroupEssenceMsgRet, Peer } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { MessageUnique } from '@/common/message-unique';
+import crypto from 'crypto';
 
 const SchemaData = {
     type: 'object',
     properties: {
-        group_id: { type: ['number', 'string'] },
-        pages: { type: ['number', 'string'] },
+        group_id: { type: ['number', 'string'] }
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupEssence extends BaseAction<Payload, GroupEssenceMsgRet> {
+export class GetGroupEssence extends BaseAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetEssenceMsg;
     payloadSchema = SchemaData;
-
+    async parseEssenceMsgImage(ele: any) {
+        return {
+            type: 'image',
+            data: {
+                url: ele?.image_url,
+            }
+        };
+    }
+    async parseEssenceMsgText(ele: any) {
+        return {
+            type: 'text',
+            data: {
+                text: ele?.text
+            }
+        };
+    }
+    async parseEssenceMsg(msgs: any) {
+        let handledMsg: any[] = [];
+        for (let msg of msgs) {
+            switch (msg.msg_type) {
+                case 1:
+                    handledMsg.push(await this.parseEssenceMsgText(msg));
+                    break;
+                case 3:
+                    handledMsg.push(await this.parseEssenceMsgImage(msg));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return handledMsg;
+    }
+    async msgSeqToMsgId(peer: Peer, msgSeq: string, msgRandom: string) {
+        const NTQQMsgApi = this.core.apis.MsgApi;
+        const replyMsgList = (await NTQQMsgApi.getMsgsBySeqAndCount(peer, msgSeq, 1, true, true)).msgList.find((msg) => msg.msgSeq === msgSeq && msg.msgRandom === msgRandom);
+        if (!replyMsgList) {
+            return undefined;
+        }
+        return {
+            id: MessageUnique.createUniqueMsgId(peer, replyMsgList.msgId),
+            msg: replyMsgList
+        }
+    }
     async _handle(payload: Payload) {
         const NTQQWebApi = this.core.apis.WebApi;
-        const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), (+(payload.pages ?? 0)).toString());
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        //await NTQQGroupApi.fetchGroupEssenceList(payload.group_id.toString());
+        let peer = {
+            chatType: ChatType.KCHATTYPEGROUP,
+            peerUid: payload.group_id.toString(),
+        };
+
+        const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString());
         if (!ret) {
             throw new Error('获取失败');
         }
-        return ret;
+        const Ob11Ret = await Promise.all(ret.data.msg_list.map(async (msg) => {
+            let msgOriginData = await this.msgSeqToMsgId(peer, msg.msg_seq.toString(), msg.msg_random.toString());
+            if (msgOriginData) {
+                const { id: message_id, msg: rawMessage } = msgOriginData;
+                return {
+                    msg_seq: msg.msg_seq,
+                    msg_random: msg.msg_random,
+                    sender_id: +msg.sender_uin,
+                    sender_nick: msg.sender_nick,
+                    operator_id: +msg.add_digest_uin,
+                    operator_nick: msg.add_digest_nick,
+                    message_id: message_id,
+                    operator_time: msg.add_digest_time,
+                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, 'array'))?.message
+                };
+            }
+            const msgTempData = JSON.stringify({
+                msg_seq: msg.msg_seq.toString(),
+                msg_random: msg.msg_random.toString(),
+                group_id: payload.group_id.toString(),
+            });
+            const hash = crypto.createHash('md5').update(msgTempData).digest();
+            //设置第一个bit为0 保证shortId为正数
+            hash[0] &= 0x7f;
+            const shortId = hash.readInt32BE(0);
+            NTQQGroupApi.essenceLRU.set(shortId, msgTempData);
+            return {
+                msg_seq: msg.msg_seq,
+                msg_random: msg.msg_random,
+                sender_id: +msg.sender_uin,
+                sender_nick: msg.sender_nick,
+                operator_id: +msg.add_digest_uin,
+                operator_nick: msg.add_digest_nick,
+                message_id: shortId,
+                operator_time: msg.add_digest_time,
+                content: await this.parseEssenceMsg(msg.msg_content)
+            };
+        }));
+        return Ob11Ret;
     }
 }

src/onebot/action/msg/GetMsg.ts

@@ -39,7 +39,7 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
         const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg.msgList[0], 'array');
         if (!retMsg) throw Error('消息为空');
         try {
-            retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!;
+            retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgList[0].msgId)!;
             retMsg.message_seq = retMsg.message_id;
             retMsg.real_id = retMsg.message_id;
         } catch (e) {

src/onebot/action/msg/SendMsg.ts

@@ -114,7 +114,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {
             const returnMsg = await this.handleForwardedNodes(peer, messages as OB11MessageNode[]);
             if (returnMsg) {
-                const msgShortId = MessageUnique.createMsg({
+                const msgShortId = MessageUnique.createUniqueMsgId({
                     guildId: '',
                     peerUid: peer.peerUid,
                     chatType: peer.chatType,
@@ -170,7 +170,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                         const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
                         if (nodeMsg) {
                             nodeMsgIds.push(nodeMsg.msgId);
-                            MessageUnique.createMsg(selfPeer, nodeMsg.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, nodeMsg.msgId);
                         }
                         //完成子卡片生成跳过后续
                         continue;
@@ -188,7 +188,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     (await Promise.allSettled(MsgNodeList)).map((result) => {
                         if (result.status === 'fulfilled' && result.value) {
                             nodeMsgIds.push(result.value.msgId);
-                            MessageUnique.createMsg(selfPeer, result.value.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, result.value.msgId);
                         }
                     });
                 } catch (e) {

src/onebot/api/msg.ts

@@ -1,4 +1,4 @@
-import { UUIDConverter } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 import { MessageUnique } from '@/common/message-unique';
 import {
     AtType,
@@ -98,14 +98,19 @@ export class OneBotMsgApi {
             }
         },
 
-        picElement: async (element, msg) => {
+        picElement: async (element, msg, elementWrapper) => {
             try {
+                const peer = {
+                    chatType: msg.chatType,
+                    peerUid: msg.peerUid,
+                    guildId: '',
+                };
                 return {
                     type: OB11MessageDataType.image,
                     data: {
                         file: element.fileName,
                         sub_type: element.picSubType,
-                        file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                        file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                         url: await this.core.apis.FileApi.getImageUrl(element),
                         file_size: element.fileSize,
                     },
@@ -117,6 +122,11 @@ export class OneBotMsgApi {
         },
 
         fileElement: async (element, msg, elementWrapper) => {
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             await this.core.apis.FileApi.addFileCache(
                 {
                     peerUid: msg.peerUid,
@@ -137,7 +147,7 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: element.filePath,
                     url: element.filePath,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
@@ -184,11 +194,16 @@ export class OneBotMsgApi {
                 '0',
                 'marketface',
             );
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             return {
                 type: OB11MessageDataType.image,
                 data: {
                     file: 'marketface',
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     path: elementWrapper.elementId,
                     url: elementWrapper.elementId,
                 },
@@ -207,13 +222,21 @@ export class OneBotMsgApi {
                 this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
                 return null;
             }
+
+            const createReplyData = (msgId: string): OB11MessageData => ({
+                type: OB11MessageDataType.reply,
+                data: {
+                    id: MessageUnique.createUniqueMsgId(peer, msgId).toString(),
+                },
+            });
+
+            if (records.peerUin === '284840486') {
+                return createReplyData(records.msgId);
+            }
+
             let replyMsg: RawMessage | undefined;
             // Attempt 1
-            replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount({
-                peerUid: msg.peerUid,
-                guildId: '',
-                chatType: msg.chatType,
-            }, element.replayMsgSeq, 1, true, true))
+            replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount(peer,element.replayMsgSeq, 1, true, true))
                 .msgList
                 .find(msg => msg.msgRandom === records.msgRandom);
 
@@ -221,7 +244,7 @@ export class OneBotMsgApi {
                 // Attempt 2
                 replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replayMsgSeq)).msgList[0];
 
-                if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
+                if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                     // Attempt 3
                     const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, records.msgSeq)).msgList;
                     if (replyMsgList.length < 1) {
@@ -233,21 +256,16 @@ export class OneBotMsgApi {
                 }
             }
 
-            return {
-                type: OB11MessageDataType.reply,
-                data: {
-                    id: MessageUnique.createMsg({
-                        peerUid: msg.peerUid,
-                        guildId: '',
-                        chatType: msg.chatType,
-                    }, replyMsg.msgId).toString(),
-                },
-            };
+            return createReplyData(replyMsg.msgId);
         },
 
         videoElement: async (element, msg, elementWrapper) => {
             const NTQQFileApi = this.core.apis.FileApi;
-
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             //读取视频链接并兜底
             let videoUrlWrappers: Awaited<ReturnType<typeof NTQQFileApi.getVideoUrl>> | undefined;
 
@@ -302,13 +320,18 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: videoDownUrl,
                     url: videoDownUrl,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
         },
 
         pttElement: async (element, msg, elementWrapper) => {
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             await this.core.apis.FileApi.addFileCache(
                 {
                     peerUid: msg.peerUid,
@@ -328,7 +351,7 @@ export class OneBotMsgApi {
                 data: {
                     file: element.fileName,
                     path: element.filePath,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
@@ -365,7 +388,7 @@ export class OneBotMsgApi {
                         async multiMsgItem => {
                             multiMsgItem.parentMsgPeer = parentMsgPeer;
                             multiMsgItem.parentMsgIdList = msg.parentMsgIdList;
-                            multiMsgItem.id = MessageUnique.createMsg(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用
+                            multiMsgItem.id = MessageUnique.createUniqueMsgId(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用
                             return await this.parseMessage(multiMsgItem);
                         },
                     ))).filter(item => item !== undefined),
@@ -823,7 +846,7 @@ export class OneBotMsgApi {
         }
         const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, waitComplete, timeout);
         if (!returnMsg) throw new Error('发送消息失败');
-        returnMsg.id = MessageUnique.createMsg({
+        returnMsg.id = MessageUnique.createUniqueMsgId({
             chatType: peer.chatType,
             guildId: '',
             peerUid: peer.peerUid,

src/onebot/index.ts

@@ -261,6 +261,7 @@ export class NapCatOneBot11Adapter {
                         emojiLikeToOthers.msgSpec!.msgSeq.toString(),
                         emojiLikeToOthers.attributes!.emojiId,
                     );
+                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
                     eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
                 }
             }
@@ -283,7 +284,7 @@ export class NapCatOneBot11Adapter {
                     this.context.logger.logDebug(`消息时间${m.msgTime}早于启动时间${this.bootTime}，忽略上报`);
                     continue;
                 }
-                m.id = MessageUnique.createMsg(
+                m.id = MessageUnique.createUniqueMsgId(
                     {
                         chatType: m.chatType,
                         peerUid: m.peerUid,
@@ -311,7 +312,7 @@ export class NapCatOneBot11Adapter {
                             if (!ob11Msg) return;
                             ob11Msg.target_id = parseInt(msg.peerUin);
                             if (this.configLoader.configData.reportSelfMessage) {
-                                msg.id = MessageUnique.createMsg({
+                                msg.id = MessageUnique.createUniqueMsgId({
                                     chatType: msg.chatType,
                                     peerUid: msg.peerUid,
                                     guildId: '',
@@ -344,7 +345,7 @@ export class NapCatOneBot11Adapter {
                 // }
 
                 if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
-                    return;
+                    continue;
                 }
                 try {
                     const requesterUin = await this.core.apis.UserApi.getUinByUidV2(req.friendUid);
@@ -367,9 +368,10 @@ export class NapCatOneBot11Adapter {
 
     private initGroupListener() {
         const groupListener = new NodeIKernelGroupListener();
-
+        
         groupListener.onGroupNotifiesUpdated = async (_, notifies) => {
             //console.log('ob11 onGroupNotifiesUpdated', notifies[0]);
+            await this.core.apis.GroupApi.clearGroupNotifiesUnreadCount(false);
             if (![
                 GroupNotifyMsgType.SET_ADMIN,
                 GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_CANCELED,

src/webui/ui/NapCat.ts

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

static/assets/renderer.js

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