GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support node id in fake forward (with auto download richMedia in reference message)

Browse Source
This commit is contained in:
pk5ls20 2024-10-27 06:50:59 +08:00
parent 0be6effc32
commit 9f07b07c82
No known key found for this signature in database
GPG Key ID: 6370ED7A169F493A
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/apis/file.ts
View File

@ -6,6 +6,7 @@ import {
Peer, Peer,
PicElement, PicElement,
PicType, PicType,
RawMessage,
SendFileElement, SendFileElement,
SendPicElement, SendPicElement,
SendPttElement, SendPttElement,
@ -267,6 +268,29 @@ export class NTQQFileApi {
return fileTransNotifyInfo.filePath; return fileTransNotifyInfo.filePath;
} }
async downloadRawMsgMedia(msg: RawMessage[]) {
const res = await Promise.all(msg.map(m =>
this.downloadMedia(m.msgId, m.chatType, m.peerUid, m.elements[0].elementId, '', '', 1000 * 60 * 2, true)
));
msg.forEach((m, index) => {
const element = m.elements[0];
switch (element.elementType) {
case ElementType.PIC:
element.picElement!.sourcePath = res[index];
break;
case ElementType.VIDEO:
element.videoElement!.filePath = res[index];
break;
case ElementType.PTT:
element.pttElement!.filePath = res[index];
break;
case ElementType.FILE:
element.fileElement!.filePath = res[index];
break;
}
});
}
async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) { async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
// 用于下载收到的消息中的图片等 // 用于下载收到的消息中的图片等
if (sourcePath && fs.existsSync(sourcePath)) { if (sourcePath && fs.existsSync(sourcePath)) {

1
src/onebot/action/msg/SendMsg.ts
View File

@ -203,6 +203,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
} }
const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0]; const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0];
logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${JSON.stringify(msg)}`); logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${JSON.stringify(msg)}`);
await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
const transformedMsg = this.core.apis.PacketApi.packetSession?.packer.packetConverter.rawMsgToPacketMsg(msg); const transformedMsg = this.core.apis.PacketApi.packetSession?.packer.packetConverter.rawMsgToPacketMsg(msg);
logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${JSON.stringify(transformedMsg)}`); logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${JSON.stringify(transformedMsg)}`);
packetMsg.push(transformedMsg!); packetMsg.push(transformedMsg!);