From 351fed735927efde24d609d66dce41d79d2dcd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Tue, 6 Aug 2024 11:30:12 +0800 Subject: [PATCH] fix #102 --- src/onebot11/action/msg/DeleteMsg.ts | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/onebot11/action/msg/DeleteMsg.ts b/src/onebot11/action/msg/DeleteMsg.ts index c7bfd237..b7ca1754 100644 --- a/src/onebot11/action/msg/DeleteMsg.ts +++ b/src/onebot11/action/msg/DeleteMsg.ts @@ -3,12 +3,15 @@ import { ActionName } from '../types'; import BaseAction from '../BaseAction'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; import { MessageUnique } from '@/common/utils/MessageUnique'; +import { sleep } from '@/common/utils/helper'; +import { NTEventDispatch } from '@/common/utils/EventTask'; +import { NodeIKernelMsgListener } from '@/core'; const SchemaData = { type: 'object', properties: { message_id: { - oneOf:[ + oneOf: [ { type: 'number' }, { type: 'string' } ] @@ -23,9 +26,27 @@ class DeleteMsg extends BaseAction { actionName = ActionName.DeleteMsg; PayloadSchema = SchemaData; protected async _handle(payload: Payload) { - const msg = await MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id)); + const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id)); if (msg) { + let ret = NTEventDispatch.RegisterListen + ( + 'NodeIKernelMsgListener/onMsgInfoListUpdate', + 1, + 5000, + (msgs) => { + if (msgs.some(m => m.msgId === msg.MsgId)) { + return true; + } + return false; + } + ).catch(e => new Promise((resolve, reject) => { resolve(undefined) })); await NTQQMsgApi.recallMsg(msg.Peer, [msg.MsgId]); + let data = await ret; + if (!data) { + throw new Error('Recall failed'); + } + //await sleep(100); + //await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId]); } } }