diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index dfdca7f6..c435316a 100644 --- a/src/onebot/api/group.ts +++ b/src/onebot/api/group.ts @@ -116,18 +116,22 @@ export class OneBotGroupApi { const searchParams = new URL(json.items[0].jp).searchParams; const msgSeq = searchParams.get('msgSeq')!; const Group = searchParams.get('groupCode'); + if (!Group) return; // const businessId = searchParams.get('businessid'); const Peer = { guildId: '', chatType: ChatType.KCHATTYPEGROUP, - peerUid: Group!, + peerUid: Group, }; const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true); + let msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list); + let realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq); return new OB11GroupEssenceEvent( this.core, parseInt(msg.peerUid), MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!, parseInt(msgData.msgList[0].senderUin), + parseInt(realMsg?.add_digest_uin ?? '0'), ); // 获取MsgSeq+Peer可获取具体消息 } diff --git a/src/onebot/event/notice/OB11GroupEssenceEvent.ts b/src/onebot/event/notice/OB11GroupEssenceEvent.ts index c06faf3c..d6346bd1 100644 --- a/src/onebot/event/notice/OB11GroupEssenceEvent.ts +++ b/src/onebot/event/notice/OB11GroupEssenceEvent.ts @@ -5,11 +5,14 @@ export class OB11GroupEssenceEvent extends OB11GroupNoticeEvent { notice_type = 'essence'; message_id: number; sender_id: number; + operator_id: number; sub_type: 'add' | 'delete' = 'add'; - constructor(core: NapCatCore, groupId: number, message_id: number, sender_id: number) { + + constructor(core: NapCatCore, groupId: number, message_id: number, sender_id: number, operator_id: number) { super(core, groupId, sender_id); this.group_id = groupId; + this.operator_id = operator_id; this.message_id = message_id; this.sender_id = sender_id; }