From a86851b338a9fcb0a762a7dc87aff59531d65ea0 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: Wed, 28 Aug 2024 13:04:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E9=AB=98=E6=95=88=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/apis/msg.ts | 2 +- src/onebot/action/msg/SendMsg.ts | 5 ----- src/onebot/api/msg.ts | 16 ++++++---------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index 9333d909..af77c1af 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -200,7 +200,7 @@ export class NTQQMsgApi { msgElements, new Map(), ], - () => true, + (ret) => ret.result === 0, msgRecords => { for (const msgRecord of msgRecords) { if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) { diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 264866ca..c1ea2cd9 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -98,11 +98,6 @@ export class SendMsg extends BaseAction { message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素', }; } - if (payload.user_id && payload.message_type !== 'group') { - // const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString()); - // const isBuddy = await NTQQFriendApi.isBuddy(uid!); - // if (!isBuddy) { } - } return { valid: true }; } diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index fd120f22..9e70b5d6 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -799,16 +799,12 @@ export class OneBotMsgApi { this.core.context.logger.logError('发送消息计算预计时间异常', e); } const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, waitComplete, timeout); - try { - returnMsg!.id = MessageUnique.createMsg({ - chatType: peer.chatType, - guildId: '', - peerUid: peer.peerUid, - }, returnMsg!.msgId); - } catch (e: any) { - this.core.context.logger.logDebug('发送消息id获取失败', e); - returnMsg!.id = 0; - } + if (!returnMsg) throw new Error('发送消息失败'); + returnMsg.id = MessageUnique.createMsg({ + chatType: peer.chatType, + guildId: '', + peerUid: peer.peerUid, + }, returnMsg.msgId); deleteAfterSentFiles.forEach(file => { fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError('发送消息删除文件失败', e)); });