From a71475be8b7ce931e42edd10a6a1f2dfee0fe092 Mon Sep 17 00:00:00 2001 From: pk5ls20 Date: Fri, 25 Oct 2024 09:17:16 +0800 Subject: [PATCH] feat: allow pass string user_id in `handleForwardedNodesPacket` --- src/onebot/action/msg/SendMsg.ts | 2 +- src/onebot/types/message.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 0454cd16..f0536190 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -157,7 +157,7 @@ export class SendMsg extends BaseAction { const OB11Data = normalize(node.data.content); const { sendElements } = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer); const packetMsgElements: rawMsgWithSendMsg = { - senderUin: node.data.user_id ?? +this.core.selfInfo.uin, + senderUin: Number(node.data.user_id) ?? +this.core.selfInfo.uin, senderName: node.data.nickname, groupId: msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : undefined, time: Date.now(), diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts index 8921afb3..37830023 100644 --- a/src/onebot/types/message.ts +++ b/src/onebot/types/message.ts @@ -16,8 +16,8 @@ export interface OB11Message { message_id: number, message_seq: number, // 和message_id一样 real_id: number, - user_id: number, - group_id?: number, + user_id: number | string, // number + group_id?: number | string, // number message_type: 'private' | 'group', sub_type?: 'friend' | 'group' | 'normal', sender: OB11Sender, @@ -149,7 +149,7 @@ export interface OB11MessageNode { type: OB11MessageDataType.node; data: { id?: string - user_id?: number + user_id?: number | string // number nickname: string content: OB11MessageMixType }; @@ -221,9 +221,9 @@ export interface OB11PostSendMsg { message: OB11MessageMixType; messages?: OB11MessageMixType; // 兼容 go-cqhttp auto_escape?: boolean | string - source?: string, - news?: { text: string }[], - summary?: string, + source?: string, + news?: { text: string }[], + summary?: string, prompt?: string } export interface OB11PostContext {