diff --git a/src/common/utils/EventTask.ts b/src/common/utils/EventTask.ts index 89a326f2..dcb15561 100644 --- a/src/common/utils/EventTask.ts +++ b/src/common/utils/EventTask.ts @@ -158,7 +158,7 @@ export class NTEventWrapper { let retEvent: any = {}; const databack = () => { if (complete == 0) { - reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout')); + reject(new Error('Timeout: NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n')); } else { resolve([retEvent as Awaited>, ...retData!]); } diff --git a/src/core/src/apis/msg.ts b/src/core/src/apis/msg.ts index 137d8faf..9e281346 100644 --- a/src/core/src/apis/msg.ts +++ b/src/core/src/apis/msg.ts @@ -1,4 +1,4 @@ -import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities'; +import { ElementType, GetFileListParam, MessageElement, Peer, RawMessage, SendMessageElement, SendMsgElementConstructor } from '@/core/entities'; import { friends, groups, selfInfo } from '@/core/data'; import { log, logWarn } from '@/common/utils/log'; import { sleep } from '@/common/utils/helper'; @@ -41,7 +41,18 @@ setTimeout(() => { loadMessageUnique().then().catch(); }); }, 100); +// setTimeout(async () => { +// let ele: MessageElement = {extBufForUI: '0x' ,...SendMsgElementConstructor.text('测试消息')}; +// let MsgId = await NTQQMsgApi.getMsgUniqueEx(); +// let peer ={ chatType: 2, peerUid: '809079648', guildId: '' }; +// console.log(await napCatCore.session.getMsgService().addLocalRecordMsg( +// peer, +// MsgId, +// ele, [], true +// )); +// console.log(await NTQQMsgApi.multiForwardMsg(peer,peer,[MsgId])); +// }, 25000) export class NTQQMsgApi { // static napCatCore: NapCatCore | null = null; // enum BaseEmojiType { @@ -142,7 +153,7 @@ export class NTQQMsgApi { }); return retMsg; } - static async getMsgUniqueEx(){ + static async getMsgUniqueEx() { let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime()); return msgId; } diff --git a/src/core/src/entities/msg.ts b/src/core/src/entities/msg.ts index 9c625bcd..bf19ad28 100644 --- a/src/core/src/entities/msg.ts +++ b/src/core/src/entities/msg.ts @@ -392,7 +392,7 @@ export interface MessageElement { avRecordElement?: AvRecordElement, structMsgElement?: null, faceBubbleElement?: FaceBubbleElement, - shareLocationElement: ShareLocationElement, + shareLocationElement?: ShareLocationElement, tofuRecordElement?: TofuRecordElement, taskTopMsgElement?: TaskTopMsgElement, recommendedMsgElement?: RecommendedMsgElement,