From f6a1b784c4d2a9694f7423b4110d9d6046642ebf 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, 25 Aug 2024 23:42:48 +0800 Subject: [PATCH] fix: type --- src/onebot/api/msg.ts | 13 +++++++------ src/onebot/types/message.ts | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 46625346..834d1bd0 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -21,6 +21,8 @@ import { OB11MessageData, OB11MessageDataType, OB11MessageFileBase, + OB11MessageForward, + OB11MessageReply, } from '@/onebot'; import { OB11Constructor } from '../helper'; import { EventType } from '@/onebot/event/OB11BaseEvent'; @@ -290,7 +292,7 @@ export class OneBotMsgApi { element.fileSize ?? '0', element.fileName, ); - + return { type: OB11MessageDataType.video, data: { @@ -302,7 +304,7 @@ export class OneBotMsgApi { } }; }, - + pttElement: async (element, msg, elementWrapper) => { await this.coreContext.apis.FileApi.addFileCache( { @@ -331,12 +333,11 @@ export class OneBotMsgApi { multiForwardMsgElement: async (_, msg) => { const NTQQMsgApi = this.coreContext.apis.MsgApi; - const message_data: OB11MessageData = { + const message_data: OB11MessageForward = { data: {} as any, - type: 'unknown' as any, + type: OB11MessageDataType.forward, }; - message_data['type'] = OB11MessageDataType.forward; - message_data['data']['id'] = msg.msgId; + message_data.data.id = msg.msgId; const parentMsgPeer = msg.parentMsgPeer ?? { chatType: msg.chatType, guildId: '', diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts index ad0b74d6..17b8a383 100644 --- a/src/onebot/types/message.ts +++ b/src/onebot/types/message.ts @@ -156,7 +156,7 @@ export interface OB11MessageCustomMusic { export interface OB11MessageJson { type: OB11MessageDataType.json; - data: { config: { token: string }, data: string }; + data: { config?: { token: string }, data: string }; } export interface OB11MessageDice {