From b9c7d3c18e0c162e1171a90b48a9c5936e0588bc 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: Sun, 19 May 2024 21:04:24 +0800 Subject: [PATCH] build: 1.3.5-re --- .../action/msg/SendMsg/create-send-elements.ts | 10 +++++++--- src/onebot11/action/msg/SendMsg/handle-forward-node.ts | 5 +---- src/onebot11/action/msg/SendMsg/index.ts | 5 +---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/onebot11/action/msg/SendMsg/create-send-elements.ts b/src/onebot11/action/msg/SendMsg/create-send-elements.ts index 34192112..17fe8aa5 100644 --- a/src/onebot11/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot11/action/msg/SendMsg/create-send-elements.ts @@ -103,12 +103,16 @@ const _handlers: { // File service - [OB11MessageDataType.image]: async (sendMsg, context) => - SendMsgElementConstructor.pic( + [OB11MessageDataType.image]: async (sendMsg, context) => { + let PicEle = await SendMsgElementConstructor.pic( (await handleOb11FileLikeMessage(sendMsg, context)).path, sendMsg.data.summary || '', sendMsg.data.subType || 0 - ), // currently not supported + ); + context.deleteAfterSentFiles.push(PicEle.picElement.sourcePath); + return PicEle; + } + , // currently not supported [OB11MessageDataType.file]: async (sendMsg, context) => { const { path, fileName } = await handleOb11FileLikeMessage(sendMsg, context); diff --git a/src/onebot11/action/msg/SendMsg/handle-forward-node.ts b/src/onebot11/action/msg/SendMsg/handle-forward-node.ts index 3fb13064..306279ad 100644 --- a/src/onebot11/action/msg/SendMsg/handle-forward-node.ts +++ b/src/onebot11/action/msg/SendMsg/handle-forward-node.ts @@ -70,7 +70,7 @@ export async function handleForwardNode(destPeer: Peer, messageNodes: OB11Messag // 自定义的消息 // 提取消息段，发给自己生成消息id try { - const { sendElements, deleteAfterSentFiles } = await createSendElements(normalize(messageNode.data.content), group); + const { sendElements } = await createSendElements(normalize(messageNode.data.content), group); logDebug('开始生成转发节点', sendElements); const sendElementsSplit: SendMessageElement[][] = []; let splitIndex = 0; @@ -102,9 +102,6 @@ export async function handleForwardNode(destPeer: Peer, messageNodes: OB11Messag nodeMsgIds.push(result.msgId); logDebug('转发节点生成成功', result.msgId); } - deleteAfterSentFiles.map(f => fs.unlink(f, () => { - })); - } catch (e) { logDebug('生成转发消息节点失败', e); } diff --git a/src/onebot11/action/msg/SendMsg/index.ts b/src/onebot11/action/msg/SendMsg/index.ts index cabe4ca0..ed8ae849 100644 --- a/src/onebot11/action/msg/SendMsg/index.ts +++ b/src/onebot11/action/msg/SendMsg/index.ts @@ -69,8 +69,7 @@ export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], de logDebug('发送消息id获取失败', e); returnMsg.id = 0; } - // deleteAfterSentFiles.map(f => fs.unlink(f, () => { - // })); + deleteAfterSentFiles.map(f => fs.unlinkSync(f)); return returnMsg; } @@ -172,8 +171,6 @@ export class SendMsg extends BaseAction { // log("send msg:", peer, sendElements) const { sendElements, deleteAfterSentFiles } = await createSendElements(messages, group); const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles); - deleteAfterSentFiles.forEach(f => fs.unlinkSync(f)); - return { message_id: returnMsg.id! }; } }