refactor: essence and together listener

This commit is contained in:
手瓜一十雪 2024-07-20 15:53:39 +08:00
parent 44d350a225
commit 7141ba1587
2 changed files with 22 additions and 7 deletions

View File

@ -46,6 +46,7 @@ import { OB11GroupMsgEmojiLikeEvent } from '@/onebot11/event/notice/OB11MsgEmoji
import { napCatCore } from '@/core'; import { napCatCore } from '@/core';
import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'; import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent';
import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent'; import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent';
import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent';
export class OB11Constructor { export class OB11Constructor {
@ -317,7 +318,7 @@ export class OB11Constructor {
if (msg.chatType !== ChatType.group) { if (msg.chatType !== ChatType.group) {
return; return;
} }
//log("group msg", msg); log("group msg", msg);
if (msg.senderUin && msg.senderUin !== '0') { if (msg.senderUin && msg.senderUin !== '0') {
const member = await getGroupMember(msg.peerUid, msg.senderUin); const member = await getGroupMember(msg.peerUid, msg.senderUin);
if (member && member.cardName !== msg.sendMemberName) { if (member && member.cardName !== msg.sendMemberName) {
@ -494,13 +495,16 @@ export class OB11Constructor {
chatType: ChatType.group, chatType: ChatType.group,
peerUid: Group! peerUid: Group!
}; };
return new OB11GroupEssenceEvent(parseInt(msg.peerUid), msg.id!);
// 获取MsgSeq+Peer可获取具体消息 // 获取MsgSeq+Peer可获取具体消息
} }
//下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE if (grayTipElement.jsonGrayTipElement.busiId == 2407) {
const memberUin = json.items[1].param[0]; //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
const title = json.items[3].txt; const memberUin = json.items[1].param[0];
logDebug('收到群成员新头衔消息', json); const title = json.items[3].txt;
return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title); logDebug('收到群成员新头衔消息', json);
return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title);
}
} }
} }
} }

View File

@ -0,0 +1,11 @@
import { OB11GroupNoticeEvent } from './OB11GroupNoticeEvent';
export class OB11GroupEssenceEvent extends OB11GroupNoticeEvent {
notice_type = 'group_essence';
message_id: number;
constructor(groupId: number, message_id: number) {
super();
this.group_id = groupId;
this.message_id = message_id;
}
}