GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:msgid generate

Browse Source
This commit is contained in:
手瓜一十雪 2024-07-22 18:17:03 +08:00
parent 338b6e4607
commit ba123236e5
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/src/apis/msg.ts
View File

@ -187,11 +187,12 @@ export class NTQQMsgApi {
}; };
await waitLastSend(); await waitLastSend();
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
let completed = false; let completed = false;
let sentMessage: RawMessage | null = null; let sentMessage: RawMessage | null = null;
const sendSuccessCBId = randomUUID() as string; const sendSuccessCBId = randomUUID() as string;
sendSuccessCBMap[sendSuccessCBId] = (msgRecord: RawMessage) => { sendSuccessCBMap[sendSuccessCBId] = (msgRecord: RawMessage) => {
console.log(msgRecord);
if (msgRecord.msgId === sentMessage?.msgId) { if (msgRecord.msgId === sentMessage?.msgId) {
if (msgRecord.sendStatus === 2) { if (msgRecord.sendStatus === 2) {
delete sendSuccessCBMap[sendSuccessCBId]; delete sendSuccessCBMap[sendSuccessCBId];
@ -214,10 +215,17 @@ export class NTQQMsgApi {
delete sendSuccessCBMap[sendSuccessCBId]; delete sendSuccessCBMap[sendSuccessCBId];
reject('发送超时'); reject('发送超时');
}, timeout); }, timeout);
const result = napCatCore.session.getMsgService().sendMsg('0', peer, msgElements, new Map()); let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime());
console.log(msgId);
const result = napCatCore.session.getMsgService().sendMsg(msgId, peer, msgElements, new Map());
}); });
} }
static async getMsgUnique(time: string) {
return napCatCore.session.getMsgService().getMsgUniqueId(time);
}
static async getServerTime() {
return napCatCore.session.getMSFService().getServerTime();
}
static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) { static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
return napCatCore.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map()); return napCatCore.session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], new Map());
} }

3
src/core/src/services/NodeIKernelMSFService.ts Normal file
View File

@ -0,0 +1,3 @@
export interface NodeIKernelMSFService {
getServerTime(): string;
}

3
src/core/src/wrapper.ts
View File

@ -40,6 +40,7 @@ import { NodeIKernelUnitedConfigService } from './services/NodeIKernelUnitedConf
import { NodeIKernelSearchService } from './services/NodeIKernelSearchService'; import { NodeIKernelSearchService } from './services/NodeIKernelSearchService';
import { NodeIKernelCollectionService } from './services/NodeIKernelCollectionService'; import { NodeIKernelCollectionService } from './services/NodeIKernelCollectionService';
import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentContactService'; import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentContactService';
import { NodeIKernelMSFService } from './services/NodeIKernelMSFService';
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
@ -231,7 +232,7 @@ export interface NodeIQQNTWrapperSession {
getLockService(): unknown; getLockService(): unknown;
getMSFService(): unknown getMSFService(): NodeIKernelMSFService;
getGuildHotUpdateService(): unknown; getGuildHotUpdateService(): unknown;