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

fix: sent pic message url

Browse Source
This commit is contained in:
linyuchen 2024-03-08 22:16:05 +08:00
parent 566537cbe3
commit 62eefbdb69
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ntqqapi/hook.ts
View File

@ -268,7 +268,7 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRe
const message = msgRecord const message = msgRecord
const peerUid = message.peerUid const peerUid = message.peerUid
// log("收到自己发送成功的消息", Object.keys(sendMessagePool), message); // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
// log("收到自己发送成功的消息", message.msgSeq); // log("收到自己发送成功的消息", message);
dbUtil.addMsg(message).then() dbUtil.addMsg(message).then()
const sendCallback = sendMessagePool[peerUid] const sendCallback = sendMessagePool[peerUid]
if (sendCallback) { if (sendCallback) {

1
src/ntqqapi/types.ts
View File

@ -233,6 +233,7 @@ export interface PicElement {
fileSize: number; fileSize: number;
fileName: string; fileName: string;
fileUuid: string; fileUuid: string;
md5HexStr?: string;
} }
export interface GrayTipElement { export interface GrayTipElement {

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

@ -214,7 +214,7 @@ 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);
const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true); const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, false);
selfNodeMsgList.push(nodeMsg); selfNodeMsgList.push(nodeMsg);
log("转发节点生成成功", nodeMsg.msgId); log("转发节点生成成功", nodeMsg.msgId);
} catch (e) { } catch (e) {
@ -368,7 +368,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
} }
} }
private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = false) { private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
if (!sendElements.length) { if (!sendElements.length) {
throw ("消息体无法解析") throw ("消息体无法解析")
} }

9
src/onebot11/constructor.ts
View File

@ -114,7 +114,14 @@ export class OB11Constructor {
// message_data["data"]["file"] = element.picElement.sourcePath // message_data["data"]["file"] = element.picElement.sourcePath
message_data["data"]["file"] = element.picElement.fileName message_data["data"]["file"] = element.picElement.fileName
// message_data["data"]["path"] = element.picElement.sourcePath // message_data["data"]["path"] = element.picElement.sourcePath
message_data["data"]["url"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl const url = element.picElement.originImageUrl
const fileMd5 = element.picElement.md5HexStr
if (url){
message_data["data"]["url"] = IMAGE_HTTP_HOST + url
}
else if (fileMd5){
message_data["data"]["file_id"] = `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${fileMd5}/0`
}
// message_data["data"]["file_id"] = element.picElement.fileUuid // message_data["data"]["file_id"] = element.picElement.fileUuid
message_data["data"]["file_size"] = element.picElement.fileSize message_data["data"]["file_size"] = element.picElement.fileSize
fileCache.set(element.picElement.fileName, { fileCache.set(element.picElement.fileName, {