GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: try to refactor forward msg

Browse Source
This commit is contained in:
linyuchen 2024-03-09 22:30:16 +08:00
parent c906bcf7ea
commit 7188946d7a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/onebot11/action/SendMsg.ts
View File

@ -14,7 +14,7 @@ import {uri2local} from "../utils";
import BaseAction from "./BaseAction"; import BaseAction from "./BaseAction";
import {ActionName, BaseCheckResult} from "./types"; import {ActionName, BaseCheckResult} from "./types";
import * as fs from "node:fs"; import * as fs from "node:fs";
import {log} from "../../common/utils"; import {log, sleep} from "../../common/utils";
import {decodeCQCode} from "../cqcode"; import {decodeCQCode} from "../cqcode";
import {dbUtil} from "../../common/db"; import {dbUtil} from "../../common/db";
import {ALLOW_SEND_TEMP_MSG} from "../../common/config"; import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
@ -195,8 +195,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
chatType: ChatType.friend, chatType: ChatType.friend,
peerUid: selfInfo.uid peerUid: selfInfo.uid
} }
let selfNodeMsgList: RawMessage[] = []; let selfNodeMsgList: RawMessage[] = []; // 自己给自己发的消息
let originalNodeMsgList: RawMessage[] = []; let originalNodeMsgList: RawMessage[] = [];
let sendForwardElements: SendMessageElement[] = []
for (const messageNode of messageNodes) { for (const messageNode of messageNodes) {
// 一个node表示一个人的消息 // 一个node表示一个人的消息
let nodeId = messageNode.data.id; let nodeId = messageNode.data.id;
@ -215,9 +216,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
deleteAfterSentFiles deleteAfterSentFiles
} = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group); } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
log("开始生成转发节点", sendElements); log("开始生成转发节点", sendElements);
sendForwardElements.push(...sendElements);
const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true); const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true);
selfNodeMsgList.push(nodeMsg); selfNodeMsgList.push(nodeMsg);
log("转发节点生成成功", nodeMsg.msgId); log("转发节点生成成功", nodeMsg.msgId);
await sleep(500);
} catch (e) { } catch (e) {
log("生效转发消息节点失败", e) log("生效转发消息节点失败", e)
} }
@ -227,27 +230,28 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
let nodeIds: string[] = [] let nodeIds: string[] = []
// 检查是否需要克隆直接引用消息id的节点 // 检查是否需要克隆直接引用消息id的节点
let needSendSelf = false; let needSendSelf = false;
if (selfNodeMsgList.length) { if (sendForwardElements.length) {
needSendSelf = true needSendSelf = true
} else { } else {
needSendSelf = !originalNodeMsgList.every((msg, index) => msg.peerUid === originalNodeMsgList[0].peerUid && msg.recallTime.length < 2) needSendSelf = !originalNodeMsgList.every((msg, index) => msg.peerUid === originalNodeMsgList[0].peerUid && msg.recallTime.length < 2)
} }
if (needSendSelf) { if (needSendSelf) {
nodeIds = selfNodeMsgList.map(msg => msg.msgId); nodeIds = selfNodeMsgList.map(msg => msg.msgId);
let sendElements: SendMessageElement[] = [];
for (const originalNodeMsg of originalNodeMsgList) { for (const originalNodeMsg of originalNodeMsgList) {
if (originalNodeMsg.peerUid === selfInfo.uid && originalNodeMsg.recallTime.length < 2) { if (originalNodeMsg.peerUid === selfInfo.uid && originalNodeMsg.recallTime.length < 2) {
nodeIds.push(originalNodeMsg.msgId) nodeIds.push(originalNodeMsg.msgId)
} else { // 需要进行克隆 } else { // 需要进行克隆
let sendElements: SendMessageElement[] = []
Object.keys(originalNodeMsg.elements).forEach((eleKey) => { Object.keys(originalNodeMsg.elements).forEach((eleKey) => {
if (eleKey !== "elementId") { if (eleKey !== "elementId") {
sendForwardElements.push(originalNodeMsg.elements[eleKey])
sendElements.push(originalNodeMsg.elements[eleKey]) sendElements.push(originalNodeMsg.elements[eleKey])
} }
}) })
try { try {
const nodeMsg = await NTQQApi.sendMsg(selfPeer, sendElements, true); const nodeMsg = await NTQQApi.sendMsg(selfPeer, sendElements, true);
nodeIds.push(nodeMsg.msgId) nodeIds.push(nodeMsg.msgId)
log("克隆转发消息成功") log("克隆转发消息到节点")
} catch (e) { } catch (e) {
log("克隆转发消息失败", e) log("克隆转发消息失败", e)
} }
@ -264,6 +268,15 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
peerUid: originalNodeMsgList[0].peerUid peerUid: originalNodeMsgList[0].peerUid
} }
} }
// elements之间用换行符分隔
// let _sendForwardElements: SendMessageElement[] = []
// for(let i = 0; i < sendForwardElements.length; i++){
// _sendForwardElements.push(sendForwardElements[i])
// _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
// }
// const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
// nodeIds.push(nodeMsg.msgId)
// await sleep(500);
// 开发转发 // 开发转发
try { try {
return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeIds) return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeIds)