diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index e688ddcf..e0294492 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -157,14 +157,7 @@ export class NTQQMsgApi { return this.context.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder); } - async recallMsg(peer: Peer, msgIds: string[]) { - await this.context.session.getMsgService().recallMsg({ - chatType: peer.chatType, - peerUid: peer.peerUid, - }, msgIds); - } - - async recallMsgV2(peer: Peer, msgId: string) { + async recallMsg(peer: Peer, msgId: string) { await this.core.eventWrapper.callNormalEventV2( 'NodeIKernelMsgService/recallMsg', 'NodeIKernelMsgListener/onMsgInfoListUpdate', diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index b95004cb..d4c314d9 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -25,15 +25,7 @@ class DeleteMsg extends BaseAction { async _handle(payload: Payload) { const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id)); if (msg) { - const ret = this.core.eventWrapper.registerListen( - 'NodeIKernelMsgListener/onMsgInfoListUpdate', - 1, - 1000, - (msgs) => !!msgs.find(m => m.msgId === msg.MsgId && m.recallTime !== '0'), - ).catch(() => undefined); - await this.core.apis.MsgApi.recallMsg(msg.Peer, [msg.MsgId]); - const data = await ret; - if (!data) throw new Error('Recall failed'); + await this.core.apis.MsgApi.recallMsg(msg.Peer, msg.MsgId); } else { throw new Error('Recall failed'); }