GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions 438 Packages Projects Releases Wiki Activity

Revert "refactor: CardChangedEvent"

Browse Source 
This reverts commit 0e8ceeb6c9.
This commit is contained in:
手瓜一十雪
2024-12-05 21:13:03 +08:00
parent 6f232c465f
commit 8d857cf2be
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/onebot/api/group.ts
View File

@@ -51,9 +51,9 @@ export class OneBotGroupApi {
if (memberUin && adminUin) { if (memberUin && adminUin) {
return new OB11GroupBanEvent( return new OB11GroupBanEvent(
this.core, this.core,
+GroupCode, parseInt(GroupCode),
+memberUin, parseInt(memberUin),
+adminUin, parseInt(adminUin),
duration, duration,
subType, subType,
); );
@@ -98,8 +98,8 @@ export class OneBotGroupApi {
} }
return new OB11GroupMsgEmojiLikeEvent( return new OB11GroupMsgEmojiLikeEvent(
this.core, this.core,
+groupCode, parseInt(groupCode),
+senderUin, parseInt(senderUin),
MessageUnique.getShortIdByMsgId(replyMsg.msgId)!, MessageUnique.getShortIdByMsgId(replyMsg.msgId)!,
[{ [{
emoji_id: emojiId, emoji_id: emojiId,
@@ -111,10 +111,9 @@ export class OneBotGroupApi {
async parseCardChangedEvent(msg: RawMessage) { async parseCardChangedEvent(msg: RawMessage) {
if (msg.senderUin && msg.senderUin !== '0') { if (msg.senderUin && msg.senderUin !== '0') {
const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin); const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
const oldName = member?.cardName || member?.nick || ''; if (member && member.cardName !== msg.sendMemberName) {
if (member && oldName !== msg.sendMemberName) {
const newCardName = msg.sendMemberName ?? ''; const newCardName = msg.sendMemberName ?? '';
const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, oldName); const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
member.cardName = newCardName; member.cardName = newCardName;
return event; return event;
} }